#61 check production
Merge branch 'master' of https://github.com/pcjpcj2/online_portfolio

Conflicts:
	app/views/devies/registrations/new.html.erb
	app/views/devise/registrations/new.html.erb
remove conflict registration new