Add Ignore
Merge branch 'gyf' of github.com:gyf1214/shstudent into gyf
solved charset problem in edit-page.php