animalena/Lab3 — pull request #3 by animalena (2014-05-16 08:57:48+00:00)
Title: Annas branch

Sending this pull request hoping that this will solve our merge conflict.