add justify user; move database.py; modify config.py
mask password
delete config.py~ database.py~
move database.py modify justify_user.py
remove osslab/__init__.py
Merge remote-tracking branch 'upstream/dev' into dev
add table register modify justify_user.py and templates.py
Merge pull request #35 from XiaoxiongZheng/dev

Dev