cleanup
Merge branch 'master' of https://github.com/Demwunz/project-init

Conflicts:
	Gruntfile.coffee
	package.json