no message
commit
Merge branch 'feature/modify' into develop

Conflicts:
	style/sass/demo.scss
Merge branch 'release/release-0.2.0'