First commit
Merge branch 'master' of github.com:tara-marchand/generator-taram

Conflicts:
	LICENSE
	README.md