<<<<<<< Updated upstream
<h1><%= @plan.plan_name %></h1>

<div class="container">
	<% @plan.recipes.each do |recipe| %>
	<div class="col-xs-4">
		<p><a href="/recipes/<%= recipe.id %>"><%= recipe.title %></a></p>
		<p>Cooking Time: <%= recipe.cook_time_minutes %> minutes</p>
	</div>
	<% end %>
</div>
=======
<h1>Feast Your Eyes on <%= @plan.plan_name %></h1>
<div class="container">
	<div class="col-xs-3"></div>
	<div class="col-xs-6">
		<% recipe_array = @plan.recipe_collection.split(", ") %>
		<% recipe_array.each do |digits| %>
			<p><%= digits.to_i %></p><br>
		<% end %>
	</div>
	<div class="col-xs-3"></div>
</div>

<!-- Pausing work on show page to investigate the form that brings in an object from another controller -->
>>>>>>> Stashed changes

<h1><%= @plan.plan_name %></h1>
<div class="container">
	<% @plan.recipes.each do |recipe| %>
	<div class="col-xs-4">
		<p><a href="/recipes/<%= recipe.id %>"><%= recipe.title %></a></p>
		<p>Cooking Time: <%= recipe.cook_time_minutes %> minutes</p>
	</div>
	<% end %>
</div>
Resolve conflict with stashed changes
Resolve conflict with stashed changes
