Initial branch
updating branch
added constructor
Merge branch 'player-roll'
merging
compare tests
Merge branch 'master' of github.com:JoshuaWordSmith/diceTest into joshsFork

Conflicts:
	app/scripts/main.js