my second change
Merge branch 'master' of https://github.com/smtorres/Class

Conflicts:
	ClassExample.R