istart update
Merge branch 'master' of github.com:ahna/wikiphilia

Conflicts:
	app/scrapeWikipedia.py
new wikiscore icon