Merge
Output files removed and added to .gitignore
Output files removing