4.meyer30 updated BasicActivity Done button
5:meyer30 Changed activity_new_workout
Merge branch 'master' into meyer30
5.meyer30 Created Schedule Class.  This might need changed later.
5.meyer30 Added functionality to change schedule
5.meyer30 udpating Schedule Activity
Updated ScheduleActivity
5.meyer30 updated AndroidManifest for ScheduleActivity
5.meyer30 merged meyer30 with master
5.meyer30 got rid of merge comments
Merge branch 'master' into meyer30
5.meyer30 added button to workout fragment
Merge branch 'master' into meyer30
5.meyer30 updated ScheduleActivity
5.meyer30 reverse the ScheduleActivity to previous version
5,angeluc2, fixed issues with getTemplates
5,madigan6: removed unused imports
5,madigan6: attempting to merge manifest
5,madigan6: merging from madigan6 to master
5,madigan6: merging from madigan6 to master continued