templte file
Merge branch 'master' of https://github.com/rparmer02/Lab6CodeReview
correct
commitMerge branch 'master' of https://github.com/rparmer02/Lab6CodeReview

Conflicts:
	templates.java