iuaehrgiuaehrgiuh
Blah 
iaurhgaieurhg
Merge branch 'feature/folder' into develop
Fixed linebreak!
Merge branch 'hotfix/0.1' into develop

Conflicts:
	test.txt