no
Merge branch 'master' of https://github.com/tomochin1314/Display_training

Conflicts:
	src/hatching.cpp
update hatching
nothing
Merge branch 'master' of https://github.com/tomochin1314/Display_training

Conflicts:
	src/situbeRender.cpp
	src/situbeRender.h
change freeglut to glut