initialized git repository
fixed README.md conflict