finish core stage1
Merge branch 'master' of https://github.com/K57CA-PMP/SaveTheWorld