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

Conflicts:
	.gitignore
initial commit
Merge https://github.com/chrismcandrew/csmcreative

Conflicts:
	.gitignore
	README.md