matt has words
adds annie and john
fixes conflict
adds thareef
Merge pull request #18 from deniseb89/master

add meeeeee...please