game almost working!
game almost wokring!
Merge branch 'master' of https://github.com/adminion/adminion

Conflicts:
	public/gamedisplay.html
	public/stylesheets/stylesheet.css

d
Merge branch 'master' of https://github.com/adminion/adminion
adminion.js mechanics updated, pretty much playable + cards viewable!
Merge branch 'master' of https://github.com/adminion/adminion