Merge origin/master

Conflicts:
	src/RfortuneTeam/HeatherandLaura/enums/ErrorType.java
	src/rfortune/PlayersList.java