added conf.json from rpi
Merge branch 'master' of https://github.com/Swaeg/madness