Displaying products & Merged other branches

NOTE: DO NOT CHANGE product.php as it is written this way for a reason