initial commit, some minor file changes
Merge remote-tracking branch 'origin/master'