.
merging
merging
Merge branch 'master' of github.com:stuycs-softdev/generate
Merge branch 'master' of github.com:stuycs-softdev/generate
fixed HTML display issue