testing
Revert "testing"

This reverts commit f66dfbc9deb494378b3884a71e3239358b121674.
Merge pull request #1 from rolipoly/master

testing pull requests and making jia do another git pull for no raisin.
testing on my own branch
Merge pull request #2 from rocketnoodlegames/develop

Updating Master to latest commits.
got baseline working
ticking now works
building buildings now works
eliminating unused files
building ticking
ticking component of game built
split out turnHandler into a new class
Merge pull request #3 from mochimind/develop

Develop
Merge pull request #4 from rocketnoodlegames/develop

Updating Master to latest develop commits.