Merge branch 'ivan'
updated styling and logic in preperation for CSS animations.
Merge branch 'ivan'
Merge branch 'master' of https://github.com/devknights/heatstroke into andy

Conflicts:
	js/app/app.js