testing-2
Merge branch 'master' of github.com:vivek2612/Toureka_DB
testing phase
Merge branch 'master' of github.com:vivek2612/Toureka_DB

Conflicts:
	toureka/app/controllers/users_controller.rb
	toureka/config/database.yml