upstream
Merge remote-tracking branch 'upstream/master'
git ignore
Merge pull request #11 from maanenh2/master

git ignore