another commit
Merge branch 'master' of https://github.com/dastardlylemon/ss12-planner
near final
Merge branch 'master' of https://github.com/dastardlylemon/ss12-planner