Fixed Dice Roll and Robber Functions
Merge branch 'master' of https://github.com/JLangowitz/Catan

Conflicts:
	CatanServer/app.py