database.yml修正とアセプリ
herokuのためのgem追加
Merge branch 'master' of https://github.com/kazukitash/nodaten_calendar

Conflicts:
	Gemfile
	config/database.yml
	public/assets/application-d52c2ecee4ecd6ea45ba58056dbbe880.js.gz
	public/assets/application-fb0b3a6ee09984497763a0fb5cbfeeb6.css.gz
	public/assets/application.css.gz
	public/assets/application.js.gz