Merge pull request #3 from JRonhovde/master

Added indexes to gameboard
Add diceroll

Added diceroll.html
basic functions for reading and writing json
Merge pull request #4 from allknowingfrog/master

basic functions for reading and writing json
testing map generation
basic system for creating a map and sending to server as json
switched to jquery cdn
Delete mapGen.php
Merge 'upstream/master'
merged upstream
combat sim
cleanup
Delete jbCombat.html~
Delete mapGen.php~
tweaks to combat sim, added css
Merge pull request #5 from allknowingfrog/master

Map Creation
Merge pull request #6 from JRonhovde/JO

I thought I did this already....

I thought you did, too.
Merge pull request #1 from thesojourner/master

sjfdgdfkgpo