Merge pull request #7 from kbreidenbach/Settings

Settings
Update README.md
Update default.properties