app/views/devise/registrations/edit.html.erb
Merge branch 'master' of https://github.com/LiaKitamura/Glass-Over-Flowing

Conflicts:
	app/views/layouts/application.html.erb