Put items in list on show page
Fix merge conflict in user show page
Remove turbolinks, add bootstrap