6.meyer30 Updated ScheduleActivity and LoginActivity.  Now using logged user.
6,angeluc2, getters and setters for templateExercise
Merge branch 'master' into meyer30
Merge branch 'master' into liu281
6,angeluc2, Fixed database operations for new template classes
Modify Login Page
Proceed to MainActivity If sharedprefs correct
Added Logout feature
Merge branch 'master' into meyer30
6,angeluc2, finished tempalteExercise db functions
6,angeluc2,finished templateWorkout db functions
6,angeluc2, finished set db functions
Merge branch 'master' into meyer30
6.meyer30 accidently deleted file.  Adding it back
Merge branch 'master' into meyer30
6,angeluc2, working on unit test
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,angeluc2,fixed lag on startup
Merge conflict