init..
Merge branch 'master' of github4net:wxg4net/heze2013.feixuelixm.teacher.com.cn

Conflicts:
	.gitignore