ShortStrawChanges
git ignore changed
XML Parsing Changes
Merge branch 'master' of https://github.com/jaideepray1989/ParallelCornerFinder

Conflicts:
	.gitignore
merge changes