changed url to the Zen one
Merge branch 'master' of https://github.com/tworns/cs190lab5_tworns

Conflicts:
	LabTemplate.java