I used the other url
Merge branch 'master' of https://github.com/garci204/cs190lab_garci204

Conflicts:
	LabTemplate.java