Controller working a little
Merge branch 'master' of https://github.com/kelthalas/gamechallenge2014-9

Conflicts:
	Assets/Prefabs/Fille.prefab
	Assets/Prefabs/Papy.prefab