before merge
Merge branch 'master' of https://github.com/AndreeaUrsulescu/issue-tracker.git

Conflicts:
	src/main/java/internship/issuetracker/controller/IssueController.java
Merge branch 'master' of https://github.com/AndreeaUrsulescu/issue-tracker.git