style
Merge branch 'master' of https://github.com/co9901/history

Conflicts:
	history.html