woops, fixing a bug
Javascript is done
Merge branch 'master' into gh-pages

Conflicts:
	Python/talon/talon.py