First round of Uploading Images
Uploading images including changes to fix user error with profile pic upload
Merge branch 'uploading-images'

Conflicts:
	Gemfile
Images updates with John