Just getting started...
Merge branch 'master' of https://github.com/chrnola/gl4sssquare

Conflicts:
	.gitignore