Adds pictures mvc and install paper clip
Merge branch 'picturemvc'

Conflicts:
	app/models/user.rb
	config/routes.rb