Merge pull request #20 from ambertunnell/ben_2

Ben 2
Merge branch 'master' of github.com:ambertunnell/worldview into ben_2
Merge pull request #21 from ambertunnell/ben_2

Ben 2
can't get out of modal
flickr photos
photos finally getting somewhere
front end work
pulled and fixed nav
working on photos
some tweaks
photos looking much better
few more tweaks
fixes photo links
working on photo button
can now view up to 100 photos per clock click
photos working with one small glitch
commit prior to pull
pulled photo changes
navbar and modal working simultaneously
centered photos