Merge pull request #1 from jdgeller/master

merge test
Merge pull request #2 from jdgeller/master

second test
test for joanna
Merge pull request #1 from jamesrhaley/master

merge with james