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

Conflicts:
	app/views/Users/show.blade.php
Worked on Connections Views and functionality.
Merge branch 'master' into cole

Conflicts:
	app/views/connections/edit.blade.php
Merge pull request #51 from areveal/cole

Cole