Add new file
Add another file
Edit file
Edit file
Edit file again
Merge branch 'feature2'

Conflicts:
	file.txt
Merge branch 'master' of github.com:dankocherga/tripping-octo-computing-machine