organizational changes
Merge branch 'master' of https://github.com/stephenkoch/toweroftime