userpage offer
	modified:   application/views/user.html
Merge branch 'master' of https://github.com/Ricer/uwcarpool
fix user.js
	modified:   application/views/user.html
	modified:   js/user.js