Changes
Merge branch 'master' of https://github.com/TraffikGroup/scottscontest

Conflicts:
	scotts/footer.php