another first commit
Merge remote-tracking branch 'origin/master' into testing

Conflicts:
	app/config/app.php
	app/config/database.php
	app/database/production.sqlite
	app/routes.php
oops
More testing
Index Page
Merge branches 'RouteIndex', 'html' and 'testing' of https://github.com/MikeShi42/Hungry.me

Conflicts:
	app/routes.php
Initial implementation of index...
Minor fixes - I refuse to/cannot fix the random search button positioning D:<
Restaurant Page Done, Need to add image
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/food_instance.php
	app/routes.php
	app/views/includes/head.blade.php
	app/views/layouts/default.blade.php
	app/views/pages/index.blade.php
Added Search functions
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/food_instance.php
	app/models/restaurant.php
Merge branch 'master' into imgupload

Conflicts:
	app/models/food_instance.php
	app/models/food_type.php
	app/models/restaurant.php
	app/routes.php
Tiny fix to ImageController.
NOTE: If food_instance_food_type_id is renamed to food_instance_food_types_id in the food_images table, please change line 25 correspondingly.