???
Merge branch 'master' of https://github.com/adrianliaw/handsome-guy-game

Conflicts:
images/text.png
statics/.DS_Store