Added a .gitignore

Important commit, fixes some merge and override problems!