GitHub repository: Karen-O/haiku_classwork
Created: 2015-03-18T15:46:30Z
Description: (purpose was to git-merge 2 branches)