cm before merge
Merge branch 'master' of github.com:aztec8/et-chickens into working
getting ready for localStorage
Merge branch 'master' of github.com:aztec8/et-chickens