added local changes
Merge branch 'master' of https://github.com/sripadkollur/mydjango

Conflicts:
	sample.py