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/stanford-ppl/Green-Marl
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl
added new giraph snapshot
Merge pull request #123 from janlugt/master

Compatibility with latest version of Giraph + new giraph snapshot
Merge branch 'master' of https://github.com/stanford-ppl/Green-Marl into vector_seq

Conflicts:
	src/Makefile

merged