Added funkomatic feature added spiced up the README.
Some conflicting changes to develop.
Merge branch 'yohan's_funkomatic_feature' into develop

Conflicts:
	README.md