Raspberry pi

great, thanks! 
Just also, you need to do "git pull" on your branch before you start the work of changes, so the branch you are working on and the master branch are aligned, and this helps also with conflicts.