(feature) Basic user page outline
Merge branch 'master' of github.com:SolidCreek/wanderlust
barebones user controller
Merge branch 'frontend' of github.com:SolidCreek/wanderlust
fixing mock data, adding calculated percentage
Merge branch 'frontend' of github.com:SolidCreek/wanderlust
(feature) User page fun features
added bootstrap theme
(fix) Changed routing params
(fix) Navbar routing
more bug fixes
Merge branch 'frontend' of https://github.com/SolidCreek/wanderlust into frontend
Merge branch 'master' of github.com:SolidCreek/wanderlust
(feat) finished user page
(bug) user errors
Merge branch 'master' of github.com:SolidCreek/wanderlust
Merge branch 'frontend' of github.com:SolidCreek/wanderlust
(fix) working on conflicts
Conflicts:
	client/app/account/user/user.html
(fix) continuing the user page fixes
Merge branch 'master' of github.com:SolidCreek/wanderlust
Merge pull request #14 from Zithrill/master

(feature) adding User page merge from frontend branch