These are junk commits

I want the other branch
Merge branch 'master' of https://github.com/jakestambaugh/CS401

Conflicts:
	Assig5/outfile
	Assig5/src/StopWatch.java