Merge pull request #11 from otorres86/master

new pop up
updated map
Resolved Conflicts
Merge pull request #12 from Sara-lily/master

Conflict Merge
Merge branch 'master' of https://github.com/jeche/dehackathon2
arrays added