Merge branch 'revised_main' into layout_1

Conflicts:
	README.txt
	gradle/wrapper/gradle-wrapper.properties
	sched/src/main/java/com/cal/sched/AddClass.java
	sched/src/main/java/com/cal/sched/Disp.java
	sched/src/main/java/com/cal/sched/myAdapter.java
Merge branch 'master' into layout_1

Conflicts:
	README.txt
	sched/src/main/java/com/cal/sched/myAdapter.java