First commit to fork
Merge pull request #4 from ibbignerd/master

Added a ton of stuff