Updated gitignore
Updated from branch 'master'