commit
Merge branch 'rama-1'

Conflicts:
	primer.txt