Added executable to gitignore
Merge branch 'dev'