commiting files
conflict resolution
Merge pull request #13 from andredempsey/nicole

commiting files