added init and correct some syntaxes
Merge branch 'master' of https://github.com/straemer/PowerGrid

Conflicts:
	player.py
Merge branch 'master' of https://github.com/straemer/PowerGrid