Fixed GitHub merging issues
Committing files that should be ignored