merged
merged
merged
Fixed merge issue
Controller is ready to recieve data from the server?
Merge pull request #17 from essamjoubori/master

Controller is ready for data