6.meyer30 Updated ScheduleActivity and LoginActivity.  Now using logged user.
Merge branch 'master' into meyer30
Merge branch 'master' into liu281
Modify Login Page
Proceed to MainActivity If sharedprefs correct
Added Logout feature
Merge branch 'master' into meyer30
Merge branch 'master' into meyer30
6.meyer30 accidently deleted file.  Adding it back
Merge branch 'master' into meyer30
Merge branch 'master' into liu281

Conflicts:
	PhpServer/.DS_Store
	WorkoutBuddy/AndroidManifest.xml
	WorkoutBuddy/res/layout/activity_login.xml
	WorkoutBuddy/res/values/strings.xml
	WorkoutBuddy/src/com/uiuc/workoutbuddy/LoginActivity.java
	WorkoutBuddy/src/com/uiuc/workoutbuddy/WorkoutListActivity.java
Resolve conflict for merge
6,madigan6: Deleted unused code and file
6,madigan6: Renamed BasicActivity to NewWorkoutActivity
Merge conflict
Modify login on shared prefs
6,madigan6: Working with Raf to update asyn wrapper
Merge remote-tracking branch 'origin/meyer30' into liu281

Conflicts:
	PhpServer/.DS_Store
	WorkoutBuddy/AndroidManifest.xml
	WorkoutBuddy/res/layout/activity_login.xml
	WorkoutBuddy/res/values/strings.xml
	WorkoutBuddy/src/com/uiuc/workoutbuddy/LoginActivity.java
	WorkoutBuddy/src/com/uiuc/workoutbuddy/WorkoutListActivity.java
merge
Merge Joel's branch