Merge branch 'master' of https://github.com/triojohn/R_project

Conflicts:
	OCS_time_series/ts_Cisco_and_EMC.R
Merge branch 'master' of https://github.com/triojohn/R_project