update grunt building task
re import main js
Merge branch 'master' of https://github.com/copycut/start-folder

Conflicts:
	Gruntfile.js
	assets/css/main.css