Merge remote-tracking branch 'origin/dev'
Merge branch 'master' of https://github.com/ClayC90/FactoryIdle
Refactors and some more basics

Tab system changes + fixes, some layout changes, css additions +
cleanup, some JS basics added
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/master' into gh-pages