atribone slides
Merge bknight/master
Do the merge thing
Merge pull request #2 from att14/master

more additions from atribone