Just cloned git
Merge branch 'master' of https://github.com/chrismcandrew/csmcreative

Conflicts:
	.gitignore