Werner has fixed some bugs at FreeCAD-Ship windows installer stuff, and pepersin has uploaded a new Windows version.

Thanks!!! Ship module runs now on Windows!

Only 1 problem detected, icons is not correctly placed because I'm stupid... I fixed that, so please can you merge sanguinariojoe-ship branch?? (When you have time)

At the other hand when i try to download master commits doing
git pull origin master
on my branch, sometimes I have conflicts that I only know to solve doing commits. Do you know a better way?