made style updates to main
Merge branch 'master' of https://github.com/GreenUmbrellaSoftware/Chronus
fixed bad merge