Because josh asked me to
Merge branch 'master' of http://github.com/anjosh/aseculus

Conflicts:
	main.js