Player Stock in NSUserDefault OK
Merge branch 'master' of https://github.com/quentinR/iVrogne

Conflicts:
	iVrogne/en.lproj/MainStoryboard_iPhone.storyboard