Clean database.yml
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop

Conflicts:
	config/database.yml
コメントアウトをCSSに追加
Igrone /vendor/ruby
Clean database
Merge branch 'develop' of https://github.com/Tacahilo/drop_the_latte into develop
アラートとキャプションのpaddingを追加
Merge branch 'develop' of github.com:Tacahilo/drop_the_latte into develop
最後の１行を削除
Merge pull request #109 from Tacahilo/feat/css_comment

CSSにコメントアウトを追加し、アラートとキャプションの文字が左に寄ってるのを修正
Merge pull request #110 from Tacahilo/develop

Develop
Merge branch 'release' of https://github.com/Tacahilo/drop_the_latte into release
Remove unneeded line
Merge pull request #1 from drop-the-comet/develop

Remove unneeded line
Merge pull request #2 from drop-the-comet/release

Release