merged
merged
...
Merge branch 'master' of https://github.com/adrianojlt/helloservlet.git

Conflicts:
	WebContent/gym/createWorkout.jsp
	WebContent/resources/js/createWorkout.js