init project
Merge branch 'master' of github.com:boyone/generic

Conflicts:
	.gitignore