..
..
Merge branch 'master' of github.com:BrianGasberg/c_library

Conflicts:
	common/version.h