Some basic turn management
Merge branch 'master' of github.com:annejse/codess_hackathon