urls.py
Merge branch 'master' of github.com:AbdealiJK/Shaastra_2k14_test