Add gitignore, ignoring all files other than /src/
Merge remote-tracking branch 'origin/master'