--c
Merge branch 'master' of https://github.com/huangguisu/bitiming

Conflicts:
	templates/score_level.tpl
-doc