coursecan be added from device
Merge branch 'master' of https://github.com/argaman-aloni/StudyBuddy

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml