update
Merge branch 'HEAD' of https://github.com/AndreeaUrsulescu/issue-tracker.git
update
Merge branch 'HEAD' of https://github.com/AndreeaUrsulescu/issue-tracker.git

Conflicts:
	src/main/webapp/resources/assets/javascript/script.js
update