initial commit
Merge branch 'master' of github.com:FrankVanVuuren/generator-frank

Conflicts:
	app/generator.coffee
	app/index.js