Third condition incorporated
Merge branch 'master' of https://github.com/namrata007/MAP

Conflicts:
	results/2013-12-07
Condition 3 incorporated