Updated files
Updated.

Merge branch 'master' of https://github.com/RobHayward/ECM04

Conflicts:
	ECM04.Rproj