Set up local environment for laravel
Merge branch 'master' into anthony
Getting database and migrations from ashley
Merge branch 'master' into anthony
Merged in alex routes and views that were pushed to master
Created Images table
Merge branch 'master' into anthony
Edited conflicts to master

Conflicts:
	app/routes.php
Corrected line 15 to create not table
Merge pull request #5 from afalsario/anthony

Anthony
added update section
added image upload function and modified rules
added upload image form
added image display
added image folder
created a one to one relationship
changed the create function to reflect new file, combined store and update functions, added the destroy function
renamed and combined create and edit profile blades
Merge pull request #6 from afalsario/alex

Alex's Commit
fixing merge conflicts
Merge pull request #7 from afalsario/afalsario

Afalsario
Adjusting everything to elimiate the profiles table. Replaced all 'profile' items with 'user' .