Merge pull request #6 from SylvainPlessis/planet_grins

Corrected evaluator,
Better input reading, all cases must be taken into account
Merge branch 'test_photo' into planet_grins