Updates to gitignore

Attempting to ignore certain files to prevent merge conflicts
Merge branch 'master' of https://github.com/VinojZ/ABCD-Company into hp