saving before merge
merge
updated gitignore