push for merge
resolving conflicts
Merge pull request #33 from andredempsey/nicole

push for merge