added badge colors to css
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/css/style.css
added all ncg layout
corrections
added ncg_talents.js, updated ncg_layout
Merge branch 'ncg_layout'
style conflict resolved. Satanic rituals completed (666%)