added git ignore
udpated git ignore
updated git ignore
updated git ignore
initial source commit
fixed merge error