lab 6 completed
Merge branch 'master' of https://github.com/mjelks/fhcs022a

Conflicts:
	notes/fhcs022a-6-events.md