Sample #2
Final changes on 7 july done
Merge branch 'master' of https://github.com/IITBInterns14/AakashTechSupport

Conflicts:
	AakashTechSupport/urls.py~
	db.sqlite3