Yeoman angularJS + express
Merge branch 'master' of https://github.com/Kribou/cloudiously

Conflicts:
	.gitignore