working normally
removed  O2 option in Makefile
Merge branch 'master' of https://github.com/zhangyulu/biyesheji

Conflicts:
	Makefile