project_init
Merge branch 'master' of https://github.com/2bg/base_projects

Conflicts:
	.gitignore