Added some changes to make Networkmanager fail silently.
Merge branch 'master' of github.com:johnsmiller/CS175

Made the SetUser fragment look nicer

Conflicts:
	PhoneApp/FingerNinja/FingerNinja/app/src/main/res/values/strings.xml