first commit
fix readme merge