Fixing styles and src
Merge branch 'master' of github.com:suca/hackday