added git ignore
modified git ignore
dunno
fixed merge