Files from server
files from server
testing hook again for the 10th time
Merge branch 'production' of kickarss.com:www/wordpress/wp-content/themes/wpkick into production

Conflicts:
	footer.php
once again for good measure