Ready for merge.
Merge pull request #53 from areveal/william

William
Updated show blade divs
Search by Proximity fully functional.
Merge branch 'master' into justin

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

Justin
Merge branch 'master' into cole

Conflicts:
	app/views/Users/create-edit.blade.php
	app/views/Users/index.blade.php
	app/views/Users/show.blade.php
Merge pull request #55 from areveal/cole

Cole
Updated profile div
Merge pull request #56 from areveal/justin

Updated profile div
Fixed Index blade.
Merge pull request #57 from areveal/cole

Fixed Index blade.
Fixed profile page and connection/edit page.
Merge pull request #58 from areveal/cole

Fixed profile page and connection/edit page.
Updated profile
Merge branch 'master' into justin

Conflicts:
	app/views/Users/index.blade.php
Merge pull request #59 from areveal/justin

Justin