First start. Added gitignore and module.txt
resolve conflicts
start module recovery