rename
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/OnGame.unity
	Assets/Prefabs/bombItem.prefab