mode pres
work
changes
changes
added index to basic output
Merge remote-tracking branch 'upstream/master'

Conflicts:
	model-dev/colins.testing.r