Add a test
Merge pull request #111 from GL-MPRI-2014/player

Player
Merge branch 'master' of https://github.com/GL-MPRI-2014/GL_MPRI_2014
Add a test
Merge branch 'player' of https://github.com/GL-MPRI-2014/GL_MPRI_2014 into player