origjaeoigjsrohsrjhi
Merge branch 'master' of https://github.com/kjjeon5204/TankGame.git

Conflicts:
	Assets/UI/Battle Scene/defeat_screen.png.meta
	Assets/UI/Battle Scene/retry_button.png.meta
	Assets/UI/Battle Scene/return_button.png.meta
	Assets/UI/Battle Scene/victory_screen.png.meta
	Assets/UI/Franklin Gothic Demi.TTF.meta
gagagarg
Merge branch 'master' of https://github.com/kjjeon5204/TankGame.git

Conflicts:
	Assets/UI/Battle Scene/continue_button.png.meta