added ignore list
updated ignore list
Merge branch 'master' of github.com:yoavram/markx
fixed .gitignore conflict.