Added gameover screen
Fixed game height issue
fixed merge conflicts
Replaced Soda by Cola item
Removed useless clearTimeout
Merge branch 'gh-pages' of https://github.com/volpeo/nutribird into gh-pages

Conflicts:
	scripts/app.coffee