merging Omar with Master

I will be merging Omar with master.