Commit
Fixed unmerged file
Added KalataOS project