Added some things to .gitignore for myself
Merge branch 'dev'
reduced boiler pressure resistance. Upped the resistance of everything else a touch.