project commit
project commit
package fixes
Merge origin/master

Conflicts:
	nbproject/project.properties
	src/model/ExerciseHolder.java
	src/views/WorkoutSelectionView.java