fixing merge conflict
commenting out print link
Merge pull request #61 from ricarora/print

Fixing Merge Conflict