3,angeluc2, fixed structure of getWorkoutListTest to correspond with new function /n also added new function getWorkoutList
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy

Conflicts:
	WorkoutBuddyTest/src/com/example/workoutbuddy/test/MainActivityTest.java