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

Conflicts:
	xcb_gol_macro.c