edit readme
add config.ru file
fix merge conflict in reademe
change readme
resolve conflict in readme