+ Message Inbox
+Merge branch 'master' of github.com:mehulkumarg/document
resolve
Conflicts:
	Gemfile