finally decent collision detection
Merge branch 'Movement' of https://github.com/meggers/devMaze into Movement

Conflicts:
	DevMaze/src/com/devtalk/maze/Player.java
updated gitignore