it's working
Merge branch 'master' of https://github.com/ohlala/soagamble

Conflicts:
	src/gamble-workflow.txt
	src/se/lnu/course4dv109/service/atomic/BetService.java
Merge branch 'master' of https://github.com/ohlala/soagamble

Conflicts:
	bin/gamble-workflow.txt
	src/se/lnu/course4dv109/service/registry/ServiceRegistry.java
Merge branch 'master' of https://github.com/ohlala/soagamble

Conflicts:
	bin/gamble-workflow.txt
	src/gamble-workflow.txt