Merge branch 'Dunn_Works'
fixed movement methods within the map class

OUUUUU
Merge branch 'master' into Dunn_Works