Merge branch 'shaneskinner'
Merge branch 'geoff' of github.com:geoffhasson/talks-may14 into geoffhasson-geoff
Merge branch 'geoffhasson-geoff'
added Geoff to the nav
Merge remote-tracking branch 'origin'