userpage
	modified:   css/user.css
user
	modified:   application/views/user.html
Merge branch 'master' of https://github.com/Ricer/uwcarpool
Merge branch 'master' of https://github.com/Ricer/uwcarpool
	modified:   application/views/user.html
	js/user.js
fixmerge
Revert "fixmerge"

This reverts commit caa0122c87804aaed44c3bd953c99aada57dcb9c, reversing
changes made to 881f351fc6b1a69e7be792de5e6c1131055a14d2.

	new file:   application/views/user.html
userpage
	modified:   application/views/user.html
	js/user.js