Code fix
Merge commit
Edited .gitignore
Edited .gitignore again