codefellows/sea-c16-javascript — pull request #148 by bparrish206 (2014-07-16 18:11:31+00:00)
Title: merge conflict fixed

I think I figured out my merge conflict and here are the person and string functions.