Merge branch 'master' of https://github.com/rehmatqadir/Rainbow-Cupcake-Land-AR

Conflicts:
.DS_Store