Initial commit
Merge branch 'master' of https://github.com/bergjs/generator-angularapp

Conflicts:
	.gitignore
	README.md