On branch master

 Initial commit

 Changes to be committed:
	new file:   GOL_test1.cpp
 On branch master
 Changes to be committed:
	modified:   GOL_test1.cpp
	new file:   test1

created generation() function
Merge branch 'master' of https://github.com/shelbyspees/GameOfLife

Inserting
 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 On branch master
 All conflicts fixed but you are still merging.

 Changes to be committed:
	new file:   .gitignore
	modified:   GOL_test1.cpp
	new file:   README.md
	modified:   test1