Spinning up the hamsters
Merge branch 'master' of https://github.com/attask/turbo-dubstep-robot

Conflicts:
	app/styles/main.css
For real this time
Merge branch 'master' of https://github.com/attask/turbo-dubstep-robot
I dont know what these changes are supposed to accomplish but somebody told me to make them.