conflict fix
addition api working
find siblings complete
Merge branch 'master' of https://github.com/lingz/trendify
meh
merge
merge