branch
Merge branch 'master' of github.com:TeckT/Html into nomaster

Conflicts:
	copiecss.txt
	copiecss.txt~
master
test
gitignore
Merge branch 'nomaster'

Conflicts:
	copiecss.txt
	copiecss.txt.orig
	copiecss.txt~
	copiecss.txt~.orig
test
Merge github.com:TeckT/Html into nomaster
Merge branch 'nomaster' of github.com:TeckT/Html into nomaster

Conflicts:
	css.css