Modified .gitignore
Merge branch 'master' into feature/asio