Merge branch 'master' of https://github.com/shilad/wikapidia

Conflicts:
	README.md