Adding unfinished ConfigurationHandler for loading and parsing config files.
fixing merge conflict in main.cpp