Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
more crap to do
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
more craMerge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign
Merge branch 'master' of https://github.com/eyli/cs195i-snapchat-redesign