settings layout
Merge branch 'master' of https://github.com/jongo216/timestamp
Merge branch 'master' of github.com:jongo216/timestamp into db