Merge pull request #10 from otorres86/master

new UI work
Merge branch 'master' of https://github.com/jeche/dehackathon2
fix html5