b
Merge branch 'master' of https://github.com/antoinehintzy/WildDucks

Conflicts:
	css/style.css
	js/script.js