Adding initial devise login
Merge branch 'master' of github-parishram:tejasvee/freedom

Conflicts:
	app/controllers/application_controller.rb
	app/models/user.rb
	config/initializers/devise.rb
	config/routes.rb
Merge branch 'master' of github-parishram:tejasvee/freedom