fixed some bugs
final test
Merge branch 'master' of https://github.com/ilovelll/ilovelll.github.io