Merge remote branch 'upstream/master'
Configfile cleanup
Merge remote branch 'origin/master'

Conflicts:
	config/config.txt
Merge branch 'master' of https://github.com/ZomgPonies/Baystation12