initial project commit
fix conflicts readme