done some stuff
Merge branch 'blabla' of https://github.com/vroosterwijk/testgit into blabla

Conflicts:
	functions.php