local changes?
Merge branch 'slider' of github.com:gabeshaughnessy/newcreatures into slider