sharedpreferences working again
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteamMeet/src/edu/gvsu/cis/greenmbr/stedmane/SteamMeet/Login.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	SteamMeet/src/edu/gvsu/cis/greenmbr/stedmane/SteamMeet/Login.java
Reconciling deep-seated differences