massive push - added settings functionality - able to add new children, parents
Merge branch 'master' of https://github.com/Xrave/CS147-Final-Project