Merge branch 'master' into branch3

Conflicts:
	app/views/restaurants/edit.html.erb
	app/views/restaurants/new.html.erb
Merge pull request #82 from toannguyenle/branch3

apply bootstrap on restaurants new.html.erb and edit.html.erb
styling
trying to merge with master