Project name, ignore generated files
Merge branch with master
Don't track autogenerated files