Fixed formatting
Merge branch 'master' of https://github.com/mesmotronic/conbo

Conflicts:
	README.md