Added q option to quit main program. Also changed waiting period for connections. Should add an option in the config file for that
Added timeout variable to config and wrote appropriate tests