Feedback Added
local_v1
pull2
a
Merge branch 'master' into local_v2

Conflicts:
	app/views/dishes/index.html.erb
Merge pull request #2 from manchesterfish/local_v2

First automatic merge after conflict due to database inconsistence (solution: http://blog.michelemattioni.me/2013/01/29/what-do-i-do-when-my-pull-request-does-not-merge-automatically-in-master/ )
9.16
9.17
Merge pull request #3 from manchesterfish/local_v2

Good
logoo changed
resized pics
Merge pull request #4 from manchesterfish/local_v3

Good!
Deleted some pictures
modified feedback page
gg
Revert 0d5faad..aab2824

This rolls back to commit 0d5faad888ddcbccc098a55341b57f1ae4a6be6f.
bundle val
Revert 0d5faad..0b91f02

This rolls back to commit 0d5faad888ddcbccc098a55341b57f1ae4a6be6f.
9.18
Merge pull request #5 from manchesterfish/local_v4

9.18