Merge confilicts solved
Merge branch 'master' of github.com:mib200/manishNsit