merging commencing
Merge branch 'master' of https://github.com/int0x191f2/redshift-gtk

Conflicts:
	gtkMain.c