amberheilman/mousetrap — pull request #17 by StoneyJackson (2013-08-16 18:47:58+00:00)
Title: Integrate Amber's documentation into development branch (logan_test)

The only conflict is .gitignore. Keep logan_test version. Otherwise works fine and doesn't interfere with anything else (from what I can tell). I recommend merging changes from master into logan_test.