Merge branch 'master' of /Users/sanjeevmishra/projects/talkdog with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/schema.rb
added columns start_at and end_at