changes to the text
Merge remote-tracking branch 'origin/master'

Conflicts:
	Course-Organizer/res/layout/activity_startup.xml