Stuff
Committing again
Deleting commented out code
Merge pull request #19 from acdevine89/master

Sorry, fixed this.