merge
Merge branch 'master' of https://github.com/MKBid/Baanmakelaar.nl.git
merge
Merge branch 'master' of https://github.com/MKBid/Baanmakelaar.nl.git
zoeken template, begin overzicht template
zoekresultaten
Merge branch 'master' of https://github.com/MKBid/Baanmakelaar.nl.git

Conflicts:
	controllers/contents_controller.php
	static/css/style.css
fix van pull.