New feature
Another part of this feature
Merge branch 'hotfix/0.1' into develop

Conflicts:
	classes/Test.php
Carry on with my feature
Merge branch 'feature/NewFeature' into develop
Merge branch 'hotfix/0.2' into develop

Conflicts:
	classes/Test.php
Merge branch 'hotfix/0.0.3' into develop

Conflicts:
	classes/Test.php
New feature
Merge branch 'release/0.0.4'