login function
resolve conflicts
Merge branch 'master' of https://github.com/ashishchopra0308/castlight_gaming
merge conflict