completing functionality on profile page
looking for changes
Fixed div problems.
Merge branch 'master' of github.com:areveal/capstone
Merge branch 'master' into william

Conflicts:
	app/views/Users/show.blade.php
Merge pull request #47 from areveal/william

William