tried to do the commit before pull.
Merge branch 'master' of https://github.com/Jabberwocked/Miljoenenidee

Conflicts:
	class/deploy.php
Merge branch 'master' of https://github.com/Jabberwocked/Miljoenenidee

Conflicts:
	class/deploy.php