Initial commit
Create index.html
first commit
2th
2th
1st change
2nd

细节修饰
3nd

数值修改
test-linux
this is a test in linux
Merge branch 'master' of https://github.com/shallyu/SHU2048

Conflicts:
	index.html
	index.html~
Merge branch 'gh-pages' of https://github.com/shallyu/SHU2048

Conflicts:
	index.html
	index.html~
	js/html_actuator.js
	style/heart.jpg
	style/main.css
	style/photo1.jpeg
	style/photo10.jpg
enclose the page.