Bug fix
Merge branch 'master' of https://github.com/shiyingzheng/shiying_ben_hw6

Conflicts:
	format.c
Bug fix in left align