Misc Cleanup
Merge branch 'master' of https://github.com/lukegeiken4/SquareinfinityWeb