EXAMS description
Merge remote-tracking branch 'origin/marcia'

Conflicts:
	agdrift/__init__.pyc