more settings
Merge branch 'wip' into wip-authentication
more read me