Merge pull request #2 from co2meal/master

Merge pull request #6 from nona1314/master
Merge remote-tracking branch 'upstream/master'
problem show

problem show
problem show.

show
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
problem index link

link it
Merge pull request #9 from nona1314/master

problem show