Merge remote-tracking branch 'origin/master' into josh
tasha's work
Merge branch 'lance'
fixing merge conflicts
Merge branch 'master' into josh
added visual elements dice number, side number, roll button and display field. numbers currently accept a dice number and a side which is the same for all selected die. results append to four divs in the display field.
homework1
Merge branch 'master' into josh
Merge pull request #4 from gingerrific/josh

basic html and css to show JS function
updated
styles
updated-2
fixing conflicts with master branch, premerge
Merge pull request #5 from gingerrific/groupwork

Tasha
Stashing to Merge Master
stashing files for origin pull
Merge branch 'master' of github.com:gingerrific/dice-roll-group

Conflicts:
	app/index.html
	app/scripts/main.js
	app/styles/main.scss
Merge branch 'master' into lance

Conflicts:
	test/spec/test.js