fixed brakes spell-o
faster water
Merge branch 'master' into gh-pages