Added authors to readme
Fixed readme conflict
Commented out todo stuff