merged temp branch with master
Implemented Devise for users