hm.
Merge pull request #6 from tomatosalad/dev

hm.
Merge pull request #7 from SteamBots/dev

Cleaning up some files, still not where I want things to be