Added a version string
Added the timer feature
Merge branch 'add-version'

Conflicts:
	src/ljmd.c
Fixed a bug