create file index
create file index
Merge branch 'gh-pages' of http://github.com/5710121077-Supang/WebProject into gh-pages

Conflicts:
	index.html
create file index
create file news1
create file news1