modify display a little bit
Merge branch 'master' of github.com:jl3937/cg_project

Conflicts:
	src/main.cpp