commented video code
started pic comments
Merge branch 'housekeeping'
Merge branch 'master' of github.com:shawnbro/quick_shark into housekeeping
commented pics code
Merge branch 'master' of github.com:shawnbro/quick_shark into housekeeping
merge
merge
Merge branch 'master' into housekeeping
merge
merge
added some tests for topic show page
Merge branch 'master' of github.com:shawnbro/quick_shark into fixmovingdivs
fixed merge conflicts
added comments on the js page and topics helper
search results null catch all and test
style for no search results
fix merge conflicts
fixed merge conflicts
fixed no results thingy