initial commit
modified git ignore
fixed conflict