Animation finished for 2 players, playercontrol.js universalized
resolved merges
Merge branch 'master' of https://github.com/Heia-/Imagine