updating
Merge branch 'master' of heroku.com:railstestsadler

Conflicts:
	app/views/providers/index.html.erb

Implemented uploading and rendering images to db
updating