reformated README.md (half done)
Finally runnable
fixed conflict