adding dashboard
test
Merge branch 'master' of github.com:lazygyu/cyphers_defense_js

Conflicts:
	js/ContentManager.js
	js/player.js