Removed files that are not needed (mostly leftovers from the past).
Merge remote-tracking branch 'origin/master'