Updated readme
Externalising the config properties so that they can be overridden from the application.conf file
Resolved conflicts