宝箱
Merge branch 'master' of https://github.com/yosukeadachi/DGJ20140524

Conflicts:
	project/Assets/Image/shark2.png.meta