Merge pull request #1 from aebrett/master

Add more content to foo.txt
More descriptive text for bar
Merge pull request #3 from aebrett/feature/bar2

feature/bar2
Merge branch 'master' into feature/bar

Conflicts:
	bar.txt