plane
Merge branch 'master' of https://github.com/jhoward/bigbrother

Conflicts:
	matlab/arima_forecast/runs/runAvgActivity.m
plat