Merge branch 'Giuseppe'
S1.png in S.png
Merge branch 'master' of https://github.com/parloma/robotcontrol into Giuseppe
"Ready 4 sklearn 0152"
Compatible with x64