BLAH
yaya
Merge branch 'master' of github.com:jcancino/tastebahamas

Conflicts:
	app/database/migrations/2014_09_18_092057_create_inventory_table.php