Finished script implementation
Merge remote-tracking branch 'origin/master'

Conflicts:
	game.py
Merge branch 'master' of https://github.com/Brolita/GameDevProject1

Conflicts:
	game.py