Fixed movement, this is stupid
Merge branch 'master' of github.com:torthefurious/Assignment3_Grail

Conflicts:
	Assignment3_Grail/src/Grailman.java
	Assignment3_Grail/src/GridFrame.java
adsfghjgj
Merge branch 'master' of github.com:torthefurious/Assignment3_Grail