Third commit
Merge branch 'master' of https://github.com/bd3dowling/EduShell

Conflicts:
	.DS_Store