mess
modify gitignore
fix conflict
merge conflict
Merge branch 'client' of github.com:DeShir/scale into client
Merge branch 'client' of github.com:DeShir/scale into client
fix some bugs