Add git-merge suggestions.
Add git-merge suggestions.

shockone/black-screen,black-screen/black-screen,drew-gross/black-screen,railsware/upterm,shockone/black-screen,drew-gross/black-screen,vshatskyi/black-screen,j-allard/black-screen,drew-gross/black-screen,vshatskyi/black-screen,black-screen/black-screen,vshatskyi/black-screen,j-allard/black-screen,drew-gross/black-screen,black-screen/black-screen,railsware/upterm,vshatskyi/black-screen,j-allard/black-screen