Greet the real king.
Merge branch 'master' of https://github.com/jnthn/teaching

Conflicts:
	src/main.c