Changed a bunch of stuff, nothing worth noting yet
Merge pull request #2 from michaeldoye/main

Changed a bunch of stuff, nothing worth noting yet