modification style
Merge branch 'master' of https://github.com/motoi75/em_project

Conflicts:
	assets/css/style.css