Fix the broken links
Fix merge conflict
Merge pull request #111 from mud-turtles-2014/json_fix

Fix the broken links