latest
Merge branch 'master' of github.com:acidjazz/milo

Conflicts:
	cfg/config.json