commit playable web
Merge branch 'local'

Conflicts:
	manager.py
	module/Player.py
	templates/index.html