Working on adding location as parameter for capoeria API calls
Refactored code for capoeira API calls, added better error handling
Merge branch 'add_location_support'
Reworking service seperation