meh
Merge branch 'master' of https://github.com/mkillebrew/C

Conflicts:
	configpush.c