Fixed problems with settings
Merge branch 'master' of https://github.com/drorcohe/finalPostPCProject