Image as background.  Sticky not moving appropriately :(
conflicts resolved
Merge pull request #6 from Sara-lily/master

Updated map -- sticky doesn't move correctly :(
Fixed merge issues
Added file necessary for heroku
fixing git ignore
Merge branch 'master' of github.com:jeche/dehackathon2
update ignore
updates
new pop up window functionality
Conflicts resolved