Merging for presentation purposes.
Merge branch 'master' into cole
Just getting ready to merge.
Merge branch 'master' into cole

Conflicts:
	app/views/Users/create-edit.blade.php
	app/views/Users/landing.blade.php
Merge pull request #30 from areveal/william

William
Merge branch 'master' into cole
Merge pull request #31 from areveal/cole

Cole
small changes
Merge branch 'master' into william
Automatic image resize functionality added.
Added uploaded images to .gitignore file.
Associations page fully functional.
Created navbar to go between edit pages.
Added navbar to edit schools view.
Merge branch 'master' into cole
Merge pull request #33 from areveal/cole

Cole
Added navbar to schools.edit blade.
Merge branch 'master' into cole
Merge pull request #34 from areveal/cole

Cole
finishing up navbar stlying