FREAKING SCENE ART OMG
Merge branch 'master' of https://github.com/bwang95/oscar-vn-gj