[FIX] first commit
Merge branch 'master' of https://github.com/albpb/generator-cameio

Conflicts:
	README.md