new stuff
javascript dice
css change
Merge branch 'master' of github.com:JoshuaWordSmith/diceTest into joshsFork

Conflicts:
	app/scripts/main.js
new test function for submit.click
new tests for button click
class changes
conflicts resolved
update
cleaned up js
Merge pull request #5 from JoshuaWordSmith/joshsFork

merging in test changes