Madison Potter altered this"
Merge branch 'master' of https://github.com/marpotter/cs190lab5_mrpotter

Conflicts:
	LabTemplate.java