boo
Merge branch 'cheat' into gh-pages
strip junk