1st commit
Merge branch 'master' of https://github.com/skoulouzis/MapReduceAssignment14-15.git