Changed the config file
Merge branch 'master' of github.com:JvanDalfsen/M7011E

Conflicts:
	config.json