Merge remote-tracking branch 'origin/Matthew-Copy' into master-copy_zach

Conflicts:
	src/edu/uark/csce/mzm/atwordsend/LoginActivity.java
Help