setting up grunt and folder structure
Merge branch 'master' of https://github.com/richard-cargill/underwear

Conflicts:
	.gitignore
	README.md
testing commit