first commit
Merge branch 'master' of github.com:jonm81/CGE

Conflicts:
	.gitignore