new
new change
new chnages
fileA Added
new change
A commited
B commited
Merge pull request #4 from enoshjustin/new_branch

Looks good - merging stuff now from the PR