Almost completed functional prototype
redid the freakin server.js
Bug fixes and stuff
moved combat_demo.html to a new folder called html
Merge branch 'mergeTest1'

Conflicts:
	index.html
	javascript/objects.js
	server.js
Added a player color indicator ribbon above the play canvas. Added some text and graphics to make changing turns more apparent. Also bug fixes