All differences between versions consolidated to FOVc.c
Merge branch 'master' of https://github.com/dmbb966/FOVc

Conflicts:
	FOVc/versions/v2/gmon.out