checking something in that probably isn't anything so I can commit
Merge branch 'master' of https://github.com/TedStudley/Cereal-Hack-3