More important
Merge branch 'master' of https://github.com/Arikito/IntShop

Conflicts:
	index.php
added variable
Merge branch 'master' of https://github.com/Arikito/IntShop