first commit
Merge branch 'master' of https://github.com/hamsterbacke23/generator-c5block

Conflicts:
	README.md