Assignment #3
Merge pull request #104 from tomnar/master

Assignment #3