merged and updated gitignore, other files