Add grunt button to readme
Quick fix
Merge branch 'master' into object

Conflicts:
	assets/app.coffee