Fix line endings in main.c?
Merge remote-tracking branch 'upstream/dev' into dev

Conflicts:
	momo_modules/pic12_executive/src/main.c