resolved conflicts
updated database with rake db:migrate
added images to asset pipeline and added carousel
edited admin cohorts form
modified question show page to make comments look better
enlarged fonts for carousel
fixed conflicts in topic show page