testing
Merge branch 'master' of https://github.com/thamill/gamejam2014.git

Conflicts:
	gamejam/src/entity/Entity.java
Merge branch 'master' of https://github.com/thamill/gamejam2014.git
borked git