吃掉

Signed-off-by: kiddliu <kiddliu@me.com>
Merge branch 'master' of https://github.com/NAUGHTY3/practice2

Signed-off-by: kiddliu <kiddliu@me.com>

Conflicts:
	index.html
我我我

Signed-off-by: kiddliu <kiddliu@me.com>