Merge pull request #37 from monicaedavidson/master

What is this? I don't even