all semesters
Merge branch 'master' of https://github.com/weshack/WesPlan

Conflicts:
	db/wesplan.db