Finish DataController
Merge pull request #1 from VictorTomaili/DataController

Finish DataController