moved __main__.py to src
ignore winds executables and egg files
resolved merge conflict