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
added links to connect pages. consolidated login/logout. TODO: redirect after login back to previous page.
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' .
consolidating tables
Merge pull request #8 from afalsario/alex

Alex committing changes
fixing merge conflicts
Merge pull request #9 from afalsario/afalsario

Afalsario
fixing bugs: routes, views, table migrations, seeding and image paths sincemerging user and profile tables
Merge pull request #10 from afalsario/afalsario

fixing bugs: routes, views, table migrations, seeding and image paths si...