Merge branch 'master' of /Users/victorkwak/Google Drive/Repo/NinjaGame with conflicts.
Testing