removed project files from gitignore again.
use git update-index --assume-unchanged filename instead
updated compiled binaries for latest hotfix
Merge branch 'master' into develop
Github merged into master instead of develop.
Conflicts:
	compiled_binaries/brewpi_avr_leonardo.hex
	compiled_binaries/brewpi_avr_uno.hex