Merge RestAPI with basic funcionality

pep8 says 2 empty lines