Merge pull request #51 from areveal/cole

Cole
Updated skills on profile page and search box
Merge branch 'master' into justin

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

Justin
Ready for merge.
added radius to form
Merge branch 'master' into william
added nav bar to index and creat-edit blades
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