done
fixed conflict
Merge pull request #27 from NathanChalot/TasksImplement

Tasks implement