Merge branch 'master' of https://github.com/PhykenMedia/HTML5_SquishyCat

THE WORST SOURCE CONTROL