addend file two changed file 1

added two lines to first file and added a second file
added third file
Merge branch 'evanssecondtestbranch' into evanstestbranch
Merge pull request #1 from evanbarba/evanssecondtestbranch

added third file
Merge branch 'evanstestbranch' of https://github.com/evanbarba/testingrepo into evanstestbranch
Merge branch 'evanstestbranch'