
Rebases I ran:

git checkout client
git rebase master
git checkout master
git merge client
git checkout server
git rebase master
git checkout master
git merge client

