first test passing
merge conflict
Merge pull request #6 from salamanders-2014/pair-jennieo23,franscan

first test passing