merge
Merge branch 'master' of https://github.com/CoolGuys/Freedom.git

Conflicts:
	src/com/freedom/gameObjects/base/Stuff.java