update on status...
Some new merges...?

Merge branch 'master' of https://github.com/Xrave/CS147-Final-Project
bugfixing in taskdetails_kid