Added reading from a config file (config.txt) from the main directory
Merge remote-tracking branch 'origin/master'