new empty repo
new submodule config
Merge branch 'master' of https://github.com/Ownageful/candybean

Conflicts:
	.gitignore
	config