Random changes
Merge branch 'master' of github.com:mburke13/uschedule

Conflicts:
	alias/uschedule.conf
	apps/uschedule/index.php