--reformatting
--added more stuff for bonus1
Merge branch 'master' of https://github.com/igorgordon/slot-machine-engine

Conflicts:
	server/src/main/java/com/win/slots/api/machine/SlotMachine.java
Merge branch 'master' of https://github.com/igorgordon/slot-machine-engine