6,angeluc2, getters and setters for templateExercise
6,angeluc2, Fixed database operations for new template classes
6,angeluc2, finished tempalteExercise db functions
6,angeluc2,finished templateWorkout db functions
6,angeluc2, finished set db functions
6,angeluc2, working on unit test
6,angeluc2,fixed lag on startup
Update loginActivityTest

refactor and add advanced test later
6,madigan6: Fixed null pointer bug
6,madigan6: Pulled, fixed merge, now pushing prev changes
6,madigan6: Added userName variable to access in rest of program (userName)
6,angeluc2, All workout functions now work, added some unit tests
6,angeluc2, finished tests for full workout
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy

Conflicts:
	WorkoutBuddy/src/httpRequests/AsyncHttpPostWrapper.java
6,angeluc2, Merged code into master with code review with Tim. Also updated schedule code to work with new template classes
removed unused code, wrote tests for refactored code
Refactor tests for User login
6,angeluc2, wrote parameterized tests for exercise and workout php code
6,angeluc2,refactored AsyncHttpPostWrapper so postData opbject can be created in 3 lines
Merge branch 'master' of https://github.com/rafaelangelucci/WorkoutBuddy