Updated associations page
Merge branch 'master' into justin
completing functionality on profile page
Updated landing page and users database
Merge pull request #45 from areveal/cole

Connections fully functional.
Merge branch 'master' into justin
looking for changes
Merge pull request #46 from areveal/justin

Justin
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
Ready to Merge.
Merge branch 'master' into cole
re-wrote edit connections to view all and added connect button
Merge branch 'master' into william
Merge pull request #48 from areveal/william

William
Ready for merge.
Merge branch 'master' into cole

Conflicts:
	app/views/Users/show.blade.php
Updated profile builder pages with add dispaly field and bottom nav buttons