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

Conflicts:
	assets/scss/base.scss