"hello"
fixed gitignore
actually added gitignore
fix merge
Fixed merge