Merged upstream master with local master

Also added gitignore