Example
Example 2
Merge branch 'master' of https://github.com/CarlosSaltaren/tw-dashboard
Incomplete commit
Merge branch 'master' of https://github.com/CarlosSaltaren/tw-dashboard

Conflicts:
	lib/handlers/message_handler.rb
	lib/services/message__repository.rb
	spec/app_spec.rb
Merge remote-tracking branch 'origin/master'