merged
Merge branch 'mengdi' of github.com:stuycs-softdev/impress7 into mengdi