Created unit tests for die roller
Merge branch 'master' into startingUI

Conflicts:
	js/testMain.js