changes in style for tags/show 05sept
add ancestry
5 sep resolving conflicts
Merge branch 'master' of github.com:DinshawRaje/satudunia
change twitter path in gemfile