parallel added; manual mode added
Merge branch 'master' of github.com:ajauhri/712_project

Conflicts:
	masterStapParse.sh