adding more git ignore stuff
Merge branch 'new_master' of https://github.com/thEtan/Mini-Project into new_master
updated gitignore
Merge branch 'ET-Dev2' into new_master