merge boss'changes
Merge branch 'master' of github.com:island205/Vroom

Conflicts:
	scripts/user.js
	user.html