first public commit
removed README conflicts