Small update
blaaa
Merge branch 'master' into gh-pages

Conflicts:
	javascript/parse.js
Merge branch 'gh-pages'
oooo yea