Don't even remember, LOTS OF CHANGES
Merge branch 'master' of https://github.com/Soben713/shametara