First two assignments; first commit
Merge http://github.com/mazur92/pr4e

Merge with remote