4.meyer30 updated BasicActivity Done button
4,madigan6: Edited manifest so cannot go back to login screen after first login
4, camargo3, Added automated tests for timer and 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
4, camargo3, Signup button adds user to db
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'
4, camargo3, login button now checks the db
Merge branch 'camargo3'
4, camargo3, Added deleteUser() and tests for login
Merge branch 'camargo3'
4, camargo3, Added tests for timer activity
Merge pull request #3 from rafaelangelucci/camargo3

4, camargo3, Added tests for timer activity