for addidas splash
Merge branch 'master' of https://github.com/rommelcaballero/nbaph-ipc

Conflicts:
	index.php
adidas splash edits