login exercise exercisetree
Merge remote-tracking branch 'origin/master'

Conflicts:
	teacher/app/js/directives.js