Merge branch 'master' of github.com:cookyt/DiceRoller

Conflicts:
	src/com/group5/diceroller/DiceSet.java
Merge branch 'master' of github.com:cookyt/DiceRoller

Conflicts:
	src/com/group5/diceroller/DiceSet.java