stuff
Merge remote-tracking branch 'origin/master'

Conflicts:
	examples/Player.py
stuff
Merge branch 'master' of
https://github.com/Smetterleen/Neopets-Python-API.git

Conflicts:
	.gitignore
	examples/Player.py
	neopapi/shops/Exceptions.py
	neopapi/shops/Shop.py