Finished japan
Merge branch 'master' of https://github.com/bnbuanes/jordbrr

Conflicts:
	Assets/Sounds/Evening of Chaos.mp3.meta
	Assets/Sounds/Part1.mp3.meta
	Assets/Sounds/part3.mp3.meta
	Assets/Sounds/part4.mp3.meta