charles like buttons and tiles
Merge branch 'design'

Conflicts:
	app/assets/stylesheets/application.css.scss