modifications
resolve merge conflict
refactor code
added doc list to show
refactor assignment.rb
merge modificaitons