update
Merge branch 'master' of https://github.com/sefonty/batchProject

Conflicts:
	src/utdallas/cs5348/batchProcessor/BatchProcessor.java