orice
Merge branch 'master' of https://github.com/RaduCiumag/Hackathon
pull request
Merge branch 'master' of https://github.com/RaduCiumag/Hackathon
pull request
Merge branch 'master' of https://github.com/RaduCiumag/Hackathon
Merge branch 'master' of https://github.com/RaduCiumag/Hackathon
Merge branch 'master' of https://github.com/RaduCiumag/Hackathon
Merge branch 'master' of https://github.com/RaduCiumag/Hackathon

Conflicts:
	src/main/java/com/endava/galaxywinners/hackathon/InputDataLoader.java
	src/main/java/com/endava/galaxywinners/hackathon/entities/PersonHourActivity.java