Greedy 1
Merge remote-tracking branch 'origin/master'
Data commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/endava/galaxywinners/hackathon/InputDataLoader.java
Some updates