Initial commit
Create index.html
Merge branch 'master' of https://github.com/TinaTina/TinaTina.github.io

Conflicts:
	.gitignore
	README.md
	index.html
Merge branch 'master' of https://github.com/TinaTina/TinaTina.github.io

Conflicts:
	.gitignore
	README.md
	index.html