premerge commit
fixed merge conflicts
built out game data and roll into the scope
Merge branch 'master' of https://github.com/jjacobskind/settlers into angularize-roll-and-resources
players have to roll before they can skip turn
commit before pull, pre-merge
concluded angularlizing road and resources
Merge pull request #95 from jjacobskind/angularize-roll-and-resources

Angularize roll and resources