:q
RAN
Merge branch 'master' of github.com:tlechauve/Manapoly

Conflicts:
	Player.java
	PlayerImpl.java