Don't busy wait in wait_for_connection
Change fps to 60. Removed try in server.
Merge
Merge branch 'master' of https://github.com/matessim/GGJ2014