Merge pull request #1 from co2meal/master

asd
태

태
Merge remote-tracking branch 'upstream/master'

Conflicts:
	db/schema.rb
Merge pull request #6 from nona1314/master

태그 머지함 ㅎ