start of redo- deal and buy phase functional. (no action cards...)
second attempt to commit:start of redo- deal and buy phase functional. (no action cards...)
Merge branch 'Zane'

Conflicts:
	index.html
	public/scripts/adminion.js