postrgres追加
Merge commit '5c998b602f4f0ce5ba51d6da9a4c462d8ec34e97'

Conflicts:
	Gemfile.lock
created show page
coderay追加
jsをcoffee化