drapes
Merge branch 'master' of https://github.com/vied12/photoautomat-circus

Conflicts:
	assets/scss/base.scss