Creating  table part two entrees
Merge

Conflicts:
	order.php