Added Inno Setup Installer Script
Fixed merge conflict in main.cpp