notes
Merge branch 'master' of github.com:kyleburton/intro-to-extending-ejabberd

Conflicts:
	TODO