formatting and braces
indentation
ignore IntelliJ files
Merge branch 'feature/windows-support' of github.com:m-mcgowan/brewpi-script into develop
better debug messages for JSON decode errors
change socket queue from 5 to 10
assume default config file ./settings/config.cfg when no argument is given
Split settings in default settings and user settings. config.cfg now overrules defautls.cfg
except keyerror, caused by old arduino hex not being compatible
fix of last commit: write to file inside try/except
removed leftover debug prints from programArduino.py
replaced leftover print statement with logMessage to print to stderr
When setting tempformat, change it in the web interface settings too.
Removed shelltest.sh
ignore tempProfile.csv.old
Merge branch 'release/v0.1'
Hotfix for not getting the default directories for programming tools right on the raspberry pi.
Merge branch 'hotfix/0.1.1' into develop
Merge branch 'develop' of https://github.com/BrewPi/brewpi-script into feature/simulator

Conflicts:
	brewpi.py
	settings/config.cfg