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 comments on the js page and topics helper
fix merge conflicts