updates
update

Merge branch 'master' of https://github.com/alanarnholt/SEMINAR

Conflicts:
	.Rhistory