fix bug
merge
change home page
merg