4,madigan6: Edited manifest so cannot go back to login screen after first login
Merge pull request #1 from rafaelangelucci/camargo3

4, camargo3, Added automated tests for timer and login
4,madigan6: Updated exercise list activity and layout
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy
Merge pull request #2 from rafaelangelucci/camargo3

4, camargo3, Signup button adds user to db
changed set up for workout/exercise/set classes
changed how workoutlist and exerciselist is returned
Update .gitignore for .DS_Store
4,angeluc2, changed how getexercise and getworkout return. THey now return objects
Add php test to User Login User Story
Merge branch 'liu281'
Merge branch 'camargo3'
Merge branch 'camargo3'
Merge pull request #3 from rafaelangelucci/camargo3

4, camargo3, Added tests for timer activity
4,madigan6: Updated exercise list
4,madigan6: added workout list adapter
4,madigan6: added workout list activity functionality
4,angeluc2,changed strcture of HTTPrequest functions to support exercise and workout classes
4,madigan6: added manual test plan for list activities
4,angeluc2, fixed parseint issue