JSON inlezen ipv .. stuff
Merge branch 'master' of https://github.com/droopram/HackNSlash

Conflicts:
	mijnid/application/controllers/MeController.php
Merge branch 'master' of https://github.com/droopram/HackNSlash