added a 3rd local file to the testing branch
Merge branch 'master' into testing
added text to the newly pulled file that was created on the web
interface