assignment1
Merge remote-tracking branch 'origin/master'

Conflicts:
	figure/plot4.R