course material stuff
Merge branch 'master' of https://github.com/mcneelym/CIS4500.git

Conflicts:
	MoodleMobile/res/layout/activity_main.xml