temp
Merge branch 'master' of github.com:KirillKayumov/adviseMe

Conflicts:
	app/views/layouts/application.html.erb
Api registration
Api login