Custom urls for sign up and sign in
Merge branch 'master' of https://github.com/riminangelica/happygram

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