javascript file
trying to merge
Merge pull request #54 from krauzer/timer

Timer
Revert "Timer"
Merge pull request #55 from aedwards12/heat_map

added parralax, and a few images
Merge pull request #56 from red-spotted-newts-2014/revert-54-timer

Revert 54 timer
removed parrallax
Merge remote-tracking branch 'upstream/master' into heat_map
merging data
 Please enter a commit message to explain why this merge is necessary,