[PX:00]settings
Merge branch 'master' of https://github.com/dvera123/project-x.git