the ultimate one ?
Merge branch 'master' of https://github.com/blagarde/riotscrape

Conflicts:
	feature_extractor.py