Raspberry pi

Conflicts solved and ready to merge.