expression update and added gitignore
added git ignore
merged trivial conflict