Merge branch 'master' of github.com:wharpreet/AgnityTutorial

Conflicts:
	3
Merge branch 'master' of github.com:wharpreet/AgnityTutorial