install grunt and create the gruntfile.js
.gitignore update
Merge branch 'install-grunt-and-create-the-gruntfile'

Conflicts:
	.gitignore