Added arduino code
fixed conflicts