added git ignore
Merge commit 'ccc3e50a61f021bc30ab35592e08e2d101fe6a3a' into dev