init commit
Modified test.txt
third change
fourth commit?
Revert "fourth commit?"

This reverts commit 5d4fd6c06303c05236f52249e35e4d38ff95e344.
Added new_file.txt, yo
Merge branch 'new_feature'

Conflicts:
	test.txt
Added file.yo
Merge branch 'master' of https://github.com/fretzorz/ballin-octo-hipster