initial commit
improve the README
fix conflicts