static files
testing some js
some interface and frontend logic
conflict fixed