worked on commenting scheme
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/dev.db
	models.rb