Assignment 2 - 21/05/2014

First personal commit