First commit
README confict fixed