ss
Merge branch 'master' of https://github.com/catalinmirghis/Training.git

Conflicts:
	src/test/java/com/requirements/Application.java
	
Because I fucked up