Generated master for commit 878c662
Merge: 7ad5e37 7dc0cb6
Author: Katy Huff <katyhuff@gmail.com>

    Merge pull request #1 from katyhuff/link_fixes