Merge branch 'master' of https://github.com/Jonazan2/Oasis.git