Set up the API, and implemented the test for the toString() and the method itself
Fixed conflicts