Rapunzel(2) is now in mapfolder
Merge branch 'master' of https://github.com/ryancheu/Battle2013Team0