Made another test file, tested branches

I added a branch that conflicts with master in order to test branches and pull requests.