SASS merg test
Merge branch 'master' of https://github.com/MKBid/Baanmakelaar.nl.git

Conflicts:
	static/css/style.css