final changes
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
merge