fixing merge issues
adding git ignore
gitignore is now working
gitignore is now working with more things ignored