commit from github2
Merge branch 'master' of https://github.com/activecs/education

Conflicts:
	README