cacan
js notes
Merge branch 'master' of github.com:greatghoul/notes

Conflicts:
	dev/javascript.rst