latest_kapil
Merge remote-tracking branch 'origin/master'

Conflicts:
	AssessingPie/views.py
Merge remote-tracking branch 'origin/master'