sam changes stuff
Merge pull request #5 from gitlaura/Sam-Branch-One

sam changes stuff