Added minor changes to level functionality
Merge branch 'master' of https://github.com/SolidCreek/wanderlust

Conflicts:
	server/api/tour/tour.controller.js
(feature) Basic user page outline
Merge pull request #8 from Zithrill/master

(Feature) Added Review Functionality
Merge branch 'master' of https://github.com/SolidCreek/wanderlust
Added in server connectivity for reviews
Merge pull request #9 from gabdallah222/master

(fix) added server connectivity for reviews
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
Added routes to send up user data
(fix) Changed routing params
Update user.model.js
(fix) Navbar routing
more bug fixes
Merge branch 'frontend' of https://github.com/SolidCreek/wanderlust into frontend