working file upload
Merge branch 'jay_paperclip' of https://github.com/JSchulhof/wdi-group-project into JSchulhof-jay_paperclip

Conflicts:
	Gemfile.lock