jladdjr/shared — pull request #3 by washington1rvingjr (2014-05-05 01:07:35+00:00)
Title: Merge conflict (revisited)

Comment here.