formatted readme for templating engine
Astyled all files
removed merge conflict