Formatting to respect PEP 8
Merge branch 'master' of https://github.com/Kor-Hal/LoL-Builder

Conflicts:
	packages/basics/champion.py
	packages/basics/item.py

Resolving conflict
Still resolving conflicts