Implemented login
Merge branch 'master' of github.com:smitparaggua/thesis-clean