Omega move to git
Merge to master