Merge branch 'master' of https://github.com/edaniszewski/fractalGraph

Conflicts:
	README.md
fix conflict