Initial commit time!
Merge branch 'master' of github.com:Diamond/gameq

Conflicts:
	.gitignore