i
Merge branch 'master' of https://github.com/rpietro/semantic_exercises

Conflicts:
	meta.R