getting my files up to date
Merge pull request #26 from brookebc/master

getting my files up to date