square
Merge branch 'master' of https://github.com/Enph/GCA2014

Conflicts:
	src/objects/Obj.java