revision
Merge branch 'master' of https://github.com/rfgmendoza/FinalLevel

Conflicts:
	includes/addtocart.php
	includes/head.php