working version
Merge pull request #1 from chorus-frogs-2014/wikireader

working version