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/ )