tidy tidy
Merge branch 'master' of https://github.com/modemlooper/thedaywefightback.wp

Conflicts:
	tdwfb/admin.php