Merge pull request #19 from felixsoum/backend

Integrate backend and frontend into master