Mostly final Sitless website!

[g-liu]

I updated my master branch by creating a pull request from uwcse440:master into g-liu:master, and now my g-liu:master is ahead of uwcse440:master by 1 commit. Not sure if this was the right thing to do!

In the end, I created the g-liu:sitless-dev branch by cherry-picking the correct commits out of g-liu:master.

[jayfo]

This was fine, but only because of the cherry pick.

The general workflow should be that your master is the same as our master. That's not true right now:

https://github.com/uwcse440/web-cse440-au15/network

So make it be true:

git checkout master
git reset --hard uwcse440/master
git push -f

You master can naturally fall behind our master as we merge work by other people. If it's behind, you just need to get it current with us again, which is:

git checkout master
git pull uwcse440 master
git push uwcse440 master

But now your feature branch is still based on the old master. You get it based on the current master before submitting the pull request with:

git checkout myfeature
git rebase -i master
git push -f