Awesome template
Merge branch 'master' of https://github.com/mortzdk/grunt-template

Conflicts:
	README.md