Initial commit
A fresh start
removed baseurl from config
Resolved merge conflicts