Merge branch 'master' of https://github.com/skastr0/Rifa.git