my...
Merge branch 'master' of https://github.com/Yanivmd/GOLGPGP

Conflicts:
	GoL-HW2/inc.h
	GoL-HW2/main.cpp