update
Merge branch 'feature/practice' into develop

Conflicts:
	style/.sass-cache/20198663e6a78fb09def87becbae516d57fff74a/demo.scssc
	style/sass/demo.scss
	style/stylesheets/demo.css