Initial attempt to set up Grunt
Merge branch 'master' of https://github.com/the3rdPoliceman/ZHMLiving

Conflicts:
	css/style.css