in play screen
Merge branch 'master' of github.com:notajingoist/blue-lips-clmtrackr

Conflicts:
	public/stylesheets/css/style.css.map
the mockups and assets for instructionsscreens
expressions, colors, updated audio