Merge branch 'master' of https://github.com/EliteTK/c-stuff

Conflicts:
	xcb_gol_macro.c
Merge branch 'master' of https://github.com/EliteTK/c-stuff