Update gitignore file
Merge branch 'bob'
Formatting the code to PEP8
Merge branch 'bob'