initial
Merge branch 'master' of github.com:omertoledano/hadoop-challenge
fixed .gitignore