Complete first draft
added resources and fixed typo (thanks Jason)
Merge remote-tracking branch 'origin/prep-hapi-intro'