Basic setup
Update .gitignore
Basic setup
Merge remote-tracking branch 'origin/master'