顔文字をひとつ追加
Update greeting.coffee

わん
Update greeting.coffee

インデント完了です。
わん
Merge pull request #14 from cohki36/cohki

Update greeting.coffee
挨拶を追加しました。
Merge branch 'feature/iorin' of https://github.com/Iorin0225/sqbot into Iorin0225-feature/iorin

Conflicts:
	scripts/greeting.coffee
Merge branch 'Iorin0225-feature/iorin'
顔文字を修正

シングルクオート混ざってたら駄目ですね、失礼しました。
Merge branch 'feature/kaomoji' of https://github.com/keima/sqbot into keima-feature/kaomoji

Conflicts:
	scripts/greeting.coffee
Merge branch 'keima-feature/kaomoji'
Including a new greeting
再チャレンジ
Merge branch 'kadai' of https://github.com/k-kuwahara/sqbot into k-kuwahara-kadai

Conflicts:
	scripts/greeting.coffee
Merge branch 'k-kuwahara-kadai'