Updated background
Merge branch 'master' of https://github.com/leowns/spotted

Conflicts:
	composer.json
	composer.lock
	web/css/3cfa5d3.css
	web/css/3cfa5d3_part_1_main_2.css
	web/js/9ec607e.js
	web/js/9ec607e_part_1_main_2.js
	web/js/bootstrap.js
	web/js/bootstrap_bc-bootstrap-collection_13.js
Updated .gitignore
Merge branch 'master' of https://github.com/leowns/spotted

Conflicts:
	composer.lock