Merge error com in up
Merge branch 'master' of github.com:worldmentr/capstone into pkuzma101

# By Donovan Becker
# Via Donovan Becker (2) and Paul Kuzma (1)
* 'master' of github.com:worldmentr/capstone:
  changed UsersController to add Auth::check to show function

Conflicts:
	app/controllers/UsersController.php
Trying to link to one's profile page - not successful yet.
Merge pull request #61 from worldmentr/pkuzma101

Pkuzma101