added ladish proj to git ignore
Merge branch 'dev'