Initial commit, the beginnings of something good (hopefully!)
Fixed conflict