Merge pull request #89 from sli-fox/jeremy

Jeremy
able to undo/redo map
Merge pull request #90 from sli-fox/mri

able to undo/redo map
Implementing Decorator Pattern on Towers
Range now uses Float instead of Enum
Merge pull request #97 from sli-fox/marky_branch

Range now uses Float instead of Enum
Replaced sf::vector with std::pair. Began implentation of freezing effect
Merge branch 'master' of https://github.com/sli-fox/jamms into ajay_branch3
Merge pull request #98 from sli-fox/ajay_branch3

Ajay branch3
Implementing Decorator pattern
fixing conflicts
Fixed getPosition in setRangeShape method
Fixed first and second from getPosition()
Merge branch 'master' of https://github.com/sli-fox/jamms into mark_branch
Undo/Redo button added
Merge branch 'master' of https://github.com/sli-fox/jamms into mri
Tower Decorator almost done
Implemented Tower Decorator
Merge pull request #99 from sli-fox/mark_branch

Mark branch
Merge branch 'master' of https://github.com/sli-fox/jamms into mri