Added a shit ton of objects and shit
REally though, objects
Merge pull request #2 from linyang625/master

Lots of shit changed. Yay hackathon