add padding
update
update
Merge branch 'feature/practice' into develop
Merge branch 'release/touring_0619'

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