restore pansy's code
Merge branch 'master' of https://github.com/toonya/iedu

Conflicts:
	style.css