bug kill 2
Merge branch 'master' of https://github.com/gauravss123/gsoc-demo-mvc