add 123.txt
a
modify iginore file
update ignore file
delete gitignore
add gitignore and 123.txt
captalize H
Merge branch 'tmp'
Capitalize W
Capitalize M
Merge branch 'tmp'
add come
add please
Merge branch 'edit_text'

Conflicts:
	index.html
Merge branch 'master' into tmp