Cleaned up some code and added XKCD to my branch
Merge pull request #32 from JonathanStarnes/master

Cleaned up some code and added XKCD to my branch