* ignore update
Merge branch 'master' of https://github.com/jihwankim/GAMEJAM2