Valid, but improper formatting.
Merge branch 'master' of github.com:ruebot/anon

Conflicts:
	conf/gccaedits.json