Updated what is tracked on the git due to stupid gitignore placement
Merge complete