changed inflammation to swelling
styling stuff
fixed merge conflict
fixed conflict again
added in googled web fonts snippet for gentium and open sans
Merge branch 'master' of github.com:juliat/copdda into gh-pages
Fixed JS error

attached min.js file instead of the other one
discovered that we need floor-# classes on all floor divs to make plugin work
It wants me to commit

So i’m committing.
Added pro-transplant video

Added the video and made video sizes responsive.
still some bug with the last floor, but most content is accessible
all but last slide working, colors rotate
merged
actually resolved conflict in index.html
added breadcrumb text
Videos

not all are there yet
Videos

Upload videos_try 2
tweaks for testing
saving changes before switching branches
merged with gh-pages