Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Fix broken link on homepage.
Merge pull request #52 from joshuajabbour/patch-1

Fix broken link on homepage.
Merge branch 'master' into gh-pages
Fixing #48, and updated the json as well
Fixing #48, and updated the json as well