Merge branch 'master' into zach2
added a spiffy logo
Merge pull request #56 from FlappyMappy/zach2

Zach2