minor changes
minor changes
Merge branch 'master' of https://github.com/dookucz/clopema_fs

Conflicts:
	src/mean_publisher.py
blah