may redesign
Merge branch 'gh-pages' of https://github.com/ctomni231/cwtactics into gh-pages

Conflicts:
	scripts/newsLoader.js
	stylesheets/site_09_2013.css