This stuff
Merge branch 'master' of https://github.com/mindaika/Bare-a-CUDA

Conflicts:
	gol_textual.cu