for merge
Merge branch 'master' of github.com:sorcerer-ma/happy612014

Conflicts:
	views/guess-game.jade