modified:   main.c
	modified:   main.h
Merge branch 'master' of https://github.com/byrdie/MOSES_FC

Conflicts:
	MOSES_FC/main.c
	MOSES_FC/main.h

	modified:   main.c

	modified:   main.h
	modified:   ../../../main.c
	modified:   ../../../main.h