OH THANK YOU IT WORKED Dictionary is online
Changes so that I can merge with zack
Hope this works

please
Made a Change
Revert "OH THANK YOU IT WORKED Dictionary is online"

This reverts commit 45fecaaf63c8656eac25be0bdb8c7769ee1abba0.

Conflicts:
	src/edu/uark/csce/mzm/atwordsend/LoginActivity.java
Merge remote-tracking branch 'origin/Matthew-Copy' into master-copy_zach

Conflicts:
	src/edu/uark/csce/mzm/atwordsend/LoginActivity.java
Help
Revert "OH THANK YOU IT WORKED Dictionary is online"

This reverts commit 45fecaaf63c8656eac25be0bdb8c7769ee1abba0.
Zack's stuff in mine.
Merge remote-tracking branch 'origin/Matthew-Copy' into master-copy_mason