some changes to intro
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC

Conflicts:
	paper.tex
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC
committing prelims
includes.tex
Merge branch 'master' of https://github.com/subodhvsharma/paper-NPC