Added stuff
Merge branch 'master' of https://github.com/Niamh1/SimpleMovements

Conflicts:
	entity/Entity.java