Abstracted dice rolling to DiceService.
Merge remote-tracking branch 'origin/master'

Conflicts:
	staticfiles/js/controllers.js