All methods fully implemented

TODO: create other methods and finish the webservice
Conflict solved