Migrated new styles from styles.cnerdforum.com
Merge branch 'master' of github.com:5290charlie/CNerdForum2

Conflicts:
	globals/header.php