css and js done
Merge branch 'master' of github.com:sureleo/hackathon