Compatibility with latest version of Giraph
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
added .gitattributes to make diffs more readable
misc
-
gitignore
Merge branch 'master' of https://github.com/janlugt/Green-Marl into java_conversion