message
Merge branch 'master' of https://github.com/rbogue/CS190

Conflicts:
	LabTemplate.java
 fix merge conflict