Commit composer.lock
Merge branch 'master' of github.com:brice/camera-obscura

Conflicts:
	composer.lock
Improving theme, inserting ads