test3
Merge branch 'master' of https://github.com/ygtw/Aminute

Conflicts:
	old.htm
merge test done