stuff
Merge branch 'master' of github.com:bitterfly/6a

Conflicts:
	web/js/data/vars.js