first commmiiittt
Merge branch 'master' of github.com:elwinmartin/AcademicScheduler

Conflicts:
	README.md
yo