merge request
Merge branch 'master' of https://github.com/gopher-snakes-2013/dim_sum_msg_board

It is necessary.
merge conflict resolver
Merge pull request #7 from gopher-snakes-2013/merge-resolver

Merge Resolver