Fixing git configuration
Definitive architecture files
Merge remote-tracking branch 'origin/master'