Work of Friday 26/04/2013

Created new files, fixing nose tests.