Commit of Tests
Merge remote-tracking branch 'origin' into lance
merging
Merge branch 'lance'
fixing merge conflicts
Merge branch 'master' into josh