switched title to equanimity
Merge branch 'master' of https://github.com/chiefbigfro/Goldilocks

 the commit.

switching title
combined devin and dan's js work, preserving all elements, styles
increases height of user show li elements
Merge pull request #30 from chiefbigfro/js_integration

Js integration