Fixed some shit
Merge pull request #6 from Joe11000/colleen_doing_stuff

ryan is sorry