intro slides
merge conflicts
Merge pull request #30 from mikehenrty/intro

intro slides, r=everyone