Merge branch 'master' of https://github.com/frankPairs/angular-grunt-structure

Conflicts:
	README.md