Need to commit?
Merge branch 'master' into development

Testing how merge works
Merge branch 'development'

Testing how merge works
Added username to registration screen. Created DB for user data, which
only includes one table for friends for now.  UserDBHelper class
interfaces with this DB. App pulls user's friends and stores here upon
login.
Added phone number field to registration
just to commit
Merge branch 'master' into gesturedetector