Merge pull request #5 from bfreeds/master

Master
Merge pull request #6 from bfreeds/master

Update index.html
Update index.html
Merge pull request #7 from bfreeds/gh-pages

added cartodb.js