modified:   nbproject/Makefile-Debug.mk
	modified:   nbproject/private/Makefile-variables.mk
	deleted:    nbproject/private/configurations.xml
	deleted:    nbproject/private/launcher.properties
	deleted:    nbproject/private/private.xml
Merge branch 'master' of https://github.com/byrdie/MOSES_FC

Conflicts:
	MOSES_FC/nbproject/Makefile-Debug.mk
	MOSES_FC/nbproject/private/private.xml

	modified:   control.c
	modified:   control.h
	modified:   hkup.c
	modified:   main.h
	modified:   nbproject/Makefile-Debug.mk
	modified:   nbproject/Makefile-Release.mk
	modified:   nbproject/configurations.xml
	new file:   nbproject/private/private.xml

	modified:   system.h