Commiting files before merge
Merge branch 'master' of https://github.com/pall75/adhd_fast
Commiting changes for setup.conf to master branch