Merge remote-tracking branch 'origin/schedule'
Merge remote-tracking branch 'origin/Search'
Merge remote-tracking branch 'origin/Search'
Derick Search
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/emersontenorio/fredschedulebuilder/DBAdapter.java
ScheduleActivity Commit