Merge pull request #13 from kendram23/user_controller

User controller
working version test page using bootstrap 3
create layout users.html.erb
Add descending order sort to user model
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/front-end'
Merge branch 'user_controller'
Merge branch 'master' into user_controller

Conflicts:
	Weightable/config/routes.rb