formula added Ankur Jain
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assesment/urls.py
	AssessingPie/views.py
	templates/AssessingPie/abc.html
adding inference engine
Ankur Jain
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/AssessingPie/abc.html
update for inference engine
Ankur Jain
object added for inference engine
Ankur Jain
Merge remote-tracking branch 'origin/master'

Conflicts:
	AssessingPie/Query.py
object added for inference engine
Ankur Jain
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/Assesment.iml
	.idea/libraries/Google_App_Engine_SDK.xml
	templates/AssessingPie/abc.html