done some loading
Merge branch 'master' of https://github.com/js3611/WebApp