Adding text to file
Snazzy. Merge branch 'Release'
Creating conflicting file
Tweaky tweak
Merge branch 'Release' into master

Conflicts:
	Bra/other.txt