remove conflict
Merge branch 'master' of github.com:ashishchopra0308/castlight_gaming