update speed to .5 seconds
run grunt build
Merge remote-tracking branch 'origin/stage'

Conflicts:
	deploy/dist/css/style.css
	deploy/dist/libs.js
	deploy/dist/script.js
remove grunt related files