Merge pull request #33 from WClement/master

FIXED SO MUCH. TIMERS AND STUFF. SMOKE WEED ERRYDAY.
Lotsa Tower stuff
Merge remote-tracking branch 'upstream/master'
Tower Changes
Tower stuff
Towers fixed
aaaa