commit
Merge branch 'feature/modify' into develop

Conflicts:
	style/sass/demo.scss