FOR SPARTA!!!
Merge branch 'master' of https://github.com/phummel/ELEN-423
No conflict
Conflicts:
	BSmith.txt