SO MUCH STUFF
Merge pull request #2 from JakeTobak/master

SO MUCH STUFF!