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

Conflicts:
	test.txt
iseghiuhsgiuh
Merge branch 'release/1.0'