small test
merge conflicts
Merge branch 'master' into animation
test coverage
added some tests for topic show page
Merge branch 'master' of github.com:shawnbro/quick_shark into fixmovingdivs
Merge branch 'animation' of github.com:kdoyne/quick_shark into kdoyne-animation
fixed merge conflicts
fixed merge conflicts
search results null catch all and test
style for no search results
fix merge conflicts
fixed merge conflicts
more tests
fixed no results thingy
bar graph hover works, color is determined by height, bar chart is below nav bar
comment in css file
resolve conflict
fixed merge conflicts
Merge branch 'master' of https://github.com/shawnbro/quick_shark