jhh
Merge branch 'master' of https://github.com/ZiyiZhao/Straight_GUI

Conflicts:
	StraightGUI/model.h