all works!!
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	public/js/login.js
	public/js/tripbookController.js
	public/js/userManager.js
more stuff