I added a button that does nothing
Merge branch 'master' of
ssh://git@github.com/Team-SwAG/Course-Organizer.git

Conflicts:
	CourseOrganizer/res/layout/activity_main.xml