show, edit users
Merge branch 'master' of https://github.com/lawsonk1215/xtkvM9PykZs8lx0M

Conflicts:
	app/Winshaw/Matrices/Objective.php
	app/controllers/UsersController.php
	app/views/matrices/objectives/show.blade.php
	app/views/users/create.blade.php
	app/views/users/show.blade.php