stupid
Merge branch 'master' of https://github.com/CowMoo728/Graph500

Conflicts:
	.gitignore