went back to stuff jon said
Merge branch 'master' of http://github.com/xkcd1253/Munchlax