commiting files
adding missing files
conflicts resolved
Merge pull request #16 from andredempsey/nicole

Nicole