Merge branch 'master' of https://github.com/ScribbleInc/Scribble

Conflicts:
blah.html
same