Starting off
First commit of existing stuff
Edited for the lulz
test
test2
Test Chris
deleted everything
Merge branch 'master' of uwegit:projectPhoenix

Conflicts:
	.gitignore
fixed
Think I reverted the code back to the origin square code