Workflow

1. To make a change to the students' version:

git pull
git checkout master

...edit a file...

git commit -am "some change"
git push

2. To sync changes to the website:

git checkout website
git merge master -m "syncing"

...build book...

git commit -am "building book"
git push