not sure what i did.
Merge branch 'master' of https://github.com/MChesney/CSE476

Conflicts:
	DroidDraw/src/edu/msu/cse/boggle/droiddraw/Cloud.java
	DroidDraw/src/edu/msu/cse/boggle/droiddraw/GCMIntentService.java
negligable changes. no push
Remember user now works for login and new user.