Changed the color of the buttons
Merge pull request #48 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony
Fixed the coloring of the buttons
Merge pull request #49 from afalsario/alex

Alex committing changes
adding photos
Merge branch 'master' into anthony
Fixed the login button to allow re-login
Cleaned up the login blade file
Merge pull request #50 from afalsario/alex

Alex committing changes
Merge branch 'master' into anthony
Database Environment set up
Merge branch 'master' into alex
securing admin page
Merge branch 'master' into afalsario
Merge branch 'master' of github.com:afalsario/commonart
Merge pull request #51 from afalsario/afalsario

Afalsario
Merge branch 'master' of github.com:afalsario/commonart
Merge branch 'master' into alex
Merge branch 'master' into anthony

Conflicts:
	public/img-upload/1_profile.jpg
	public/img-upload/2_profile.jpg