Included local directory for testing
Adds default build-files
Merge remote-tracking branch 'origin/master'