hadoop branch
hadoop branch
Merge branch 'hadoop' of https://github.com/tulinkry/DAT500 into hadoop