updated map again
Merge branch 'nctvyc_sprint3'

* nctvyc_sprint3:
  updated map again
Merge branch 'ecgprc_sprint3'
augmented state stack to work with a pending changes list, implemented troop movement (missing rotation)