07241144 Update

07241144 Update
Merge branch 'master' of https://github.com/sinri/BabyNes

Conflicts:
	Resources/Info.plist