GitHub Sucks
Merge branch 'different_assets' of https://github.com/ArchieMonji/MergeToSurvive into different_assets