changed
Merge branch 'master' of https://github.com/andrehacker/mapred
added aim3 solution 1