BBC-News/bbcnews.github.io — pull request #1 by JakeChampion (2014-02-05 19:07:17+00:00)
Title: Remove conflict

There was a conflict during a merge, this pr resolves said conflict.