posh
Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester

Conflicts:
	application/views/pages/home_view.php
Revert "Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester"

This reverts commit ca5382db62e9bab5559f366addd9f32d3ecd8303, reversing
changes made to 602468744869fa8213a0a3f8c0916ef03441924d.
Revert "Revert "Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester""

This reverts commit 0a11eab9c3348e0b122f39d767b9a823fd271cb9.
Revert "Revert "Revert "Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester"""

This reverts commit b80ce208482d3b51b5e4b09229433151dd30b7af.
pasar toda la actualizacion

This reverts commit 43105470147d69ab83576f4f368b9e4da2d5c3aa.
Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester

Conflicts:
	.DS_Store
dsds
dskljfsdl
alsdjklsjak
dsklfdklsfj
inclusion de base de datos de prueba

deben incluir la base de datos a cada localhost, para que funcione
inclusion de php en la pagina de inicio

falta el slider , y las categorias
producto

pagina basica de producto
inclusion de base de datos

deben incluirla en el php my admin
lo mismo que el anterior
productos con ejemplo

nene
implementacion de logia en productos por categoria
homeview malo
Merge branch 'tester' of https://github.com/stilexmagic/foodland into tester

Conflicts:
	application/views/pages/home_view.php