More on intro
Merge branch 'master' of https://github.com/jhollist/hkm2014
day 3 draft