Reset whatever I did on the old branch and started fresh.
New Exercise page actually adds exercise to database now.
Added more tests and fixed some issues that they uncovered. Now requires
name for each exercise.
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy.git into dwilson
Added more tests, just in case.
Adding new files from main branch.
Merge remote-tracking branch 'origin/master' into dwilson

Conflicts:
	WorkoutBuddy/AndroidManifest.xml
	WorkoutBuddy/res/layout/activity_schedule.xml
	WorkoutBuddy/res/values/strings.xml
	WorkoutBuddy/src/com/uiuc/workoutbuddy/UseWorkoutActivity.java
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/GraphActivityTest.java
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/UseWorkoutTest.java
Merged with master and fixed some compilation and naming issues.
Added "Add to Workout" button to activity_exercise_list.xml
Also changed WorkoutListActivity to use activity_workout_list instead
of activity_exercise_list.
6.meyer30 merged daniel with master
6.meyer30 merged dwilson to master
6.meyer30 merged conflict master onto dwilson
Merge branch 'master' of
https://github.com/rafaelangelucci/WorkoutBuddy.git into dwilson

Conflicts:
	WorkoutBuddy/AndroidManifest.xml
	WorkoutBuddy/res/values/strings.xml
	WorkoutBuddy/src/com/uiuc/workoutbuddy/HistoryFragment.java
	WorkoutBuddy/src/com/uiuc/workoutbuddy/LoginActivity.java
	WorkoutBuddy/src/com/uiuc/workoutbuddy/UseWorkoutActivity.java
	WorkoutBuddy/src/httpRequests/AsyncHttpPostWrapper.java
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/AsyncHttpPostTest.java
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/ExerciseListTest.java
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/LoginActivityTest.java
Finally merged with master and up to date.
Merge branch 'camargo3'
6,madigan6: Fixed share workout, adding delete workout
6,madigan6: Completed delete workout
6,madigan6: Create new activity for perform exercise
6,madigan6: added mock list testing
6,madigan6: Fixed mock tests