Merge pull request #103 from RAlmada/master

presentation edits
date fixed
testing
6/2 7:12pm
no main
Merge pull request #104 from ylevitsk/master

date fixed 6/2/2014 11:43am