no message
Merge branch 'master' of https://github.com/marcusfinney/Koala

Conflicts:
	vitalm.php