Newest changes for Mike
Another small change
Merge remote-tracking branch 'origin/Seth' into Tom

Conflicts:
	a.out