Task 6 and Task 4
Merge branch 'master' of https://github.com/Jokerro/Graph-Framework

Conflicts:
	graph.cpp
	graph.h
	main.cpp