i3 layout files added
one line formatter added
small changes
merge
rpi instructions changed
resolve conflicts