added gitignore and module.txt
fixed merge conflicts
gui changed into nui