Fixes to name files
popcorn stuff
Merge remote-tracking branch 'upstream/master'
merge
get rid of intro on pageload
link changes, 2 columns on about page
DRY stuff, fix link
map fix
New hotspot/ copy edits and new videos
Merge branch 'master' of https://github.com/Neteshy/icc505-F13
architecture, candlelight dove
new images
map fix take 2
building images, map json
changed video size
Merge branch 'master' of https://github.com/Neteshy/icc505-F13
background-position
New pictures
Merge branch 'master' of https://github.com/Neteshy/icc505-F13
moved ed