Add parameters
Merge branch 'master' of github.com:lidv/datasciencecoursera

Conflicts:
	sample.R