New pop up style
some js files added
conflicts resolved
conflicts resolved
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
aslyn updates
Merge branch 'master' of github.com:jeche/dehackathon2
update ignore
updates
new pop up window functionality
Conflicts resolved
Merge pull request #7 from otorres86/master

pop up window displays all info
Updated things
Merge branch 'master' of https://github.com/jeche/dehackathon2
Merge pull request #8 from Sara-lily/master

Updated puppy
Added a call to local storage