ignore update
coreutils.h change
bahh
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitignore
	Debug/vc120.idb
	Debug/vc120.pdb