Added tests, began readme.
Fixed merge conflicts