updated gitignore list
Merhed some files