Design added
ui adjustement for the welcome page
fixing merging conflict
Merge branch 'ui'
tags/show.html.erb not modified