Pushed Xv6 part of p4
Solved the conflicts -1
Added linux part of p4