Changes to Restaurants, Show, Testing
Merging Changes

Conflicts:
	.gitignore
Merging Changes