Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #12 from Sara-lily/master

Conflict Merge
fix html5
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #13 from otorres86/master

fixed bug in popup
arrays added
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #16 from Sara-lily/master

Updated things
game logic
Conflicts resolved
Merge pull request #17 from otorres86/master

game logic
updated things
resolved conflicts