Minor changes
Merge branch 'master' of github.com:naio/Vitals

Conflicts:
	include/CLTimer.h
	src/CLTimer.cpp