scrolling yay
Merge branch 'master' of https://github.com/Captainkrtek/CopperResistance

Conflicts:
	templates/wire.php