Merge pull request #48 from sli-fox/marky_branch

Replaced Tower's 2D vector with a Map and smashed bugs