added tasks controller
Merge pull request #17 from rarice4/master

added tasks controller
fixed merge issues