renamed default file to a more conventional name
merged with master