I like Octocat better
Merge branch 'master' of https://github.com/MonoAlpaca/Template

Conflicts:
	LabTemplate.java