cleanup
stuff
watashiwa

manual file merge
Merge branch 'master' of https://github.com/cripplet/SE-800