Changed title.
Changed title
Merged conflicts
Merge pull request #1 from plusplus/shared_branch

Fixing the title + jokes