commit to feature/homepage
Another commit on feature/homepage
Commit to trippage
Merge branch 'feature/homepage' into develop

Conflicts:
	test.txt
Merge branch 'release/0.1.0'