lab5 update
Merge branch 'master' of https://github.com/childrj/cs190lab5_childrj

Conflicts:
	LabTemplate.java