Merge branch 'master' into css_stuff
header styling
Merge branch 'master' into css_stuff
Merge branch 'master' into animation
small style fixes
Merge pull request #51 from kdoyne/animation

small style fixes
zoom and pan
Merge pull request #52 from kdoyne/animation

zoom and pan
changed use Canonical to true in wordnik api query
fixed timeline bug where timeline wasn't adding things properly
Merge pull request #53 from kevinmcalear/timeline_fix

fixed timeline bug where timeline wasn't adding things properly
format for images
updating definitions and reverse definitions
Merge pull request #54 from kdoyne/animation

updating definitions and reverse definitions
small styling
Merge pull request #55 from kdoyne/animation

small styling
changed coloring
resolved merge
fixed position
loads 4 images with some new css