started intro stuff, took out the stupid 'ok' thing breaking getting players on start
Merge remote-tracking branch 'origin/master'