Updated readme
Merge branch 'master' of https://github.com/arrizer/Prettypedia

Conflicts:
	README.md