change stuff
Merge branch 'master' of https://github.com/lperardi/YSC2