Fir changed b
Merge branch 'master' of https://github.com/ggeise/Playing

Conflicts:
	b.py
Merge branch 'master' of https://github.com/ggeise/Playing

Conflicts:
	b.py