some design
Merge remote-tracking branch 'origin/master'

Conflicts:
	style/consumption.css
some design