commit
Merge branch 'master' of https://github.com/sznote/TestAjax

Conflicts:
	mypage.html
commit