Adding authentication
Merge branch 'user'

Conflicts:
	app/models/user.rb