Work on login and register
Merge branch 'master' of https://github.com/VRP-HackFmi3/HelpMeOut

Conflicts:
	controllers/website_controller.rb
	my_app.rb