my changes, dans changes, our changes
 dan says
Merge branch 'bootstrap-css' of https://github.com/redswaggon/red-wagon into chat
works.  need to make a decision re the description view