Merge pull request #111 from sli-fox/steph_branch

Steph branch
Added Jeremy's effects within the respective Effect decorator
Merge pull request #112 from sli-fox/mark_branch

Added Jeremy's effects within the respective Effect decorator
Moved 'Tower* _decoratedTower' to TowerDecorator class, and is now inherited by all its childs
Merge branch 'master' of https://github.com/sli-fox/jamms into mark_branch
Merge pull request #113 from sli-fox/mark_branch

Mark branch
tower level 3 not selectable still, mark please make sure decorated towers still work with tower_manager.getTower(x,y)
Merge pull request #114 from sli-fox/jeremy

tower level 3 not selectable still, mark please make sure decorated towe...
New doxy