Route functionality added
Merge branch 'login'

Conflicts:
	app/actions.rb
	app/models/user.rb