5,angeluc2, added java code for adding template workouts and exercises
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
5.meyer30 merged meyer30 with master