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

Conflicts:
	MoodleMobile/src/com/example/moodlemobile/MainActivity.java