Newstyle - Deliver # 77425164

icons not working yet
I'm confused.  Did I accidentally take something out? That might have been from the merge conflicts I was having that I emailed you about. I still have trouble telling what is from what branch/head when looking at merge conflicts. Sorry if I screwed something up. 

emily a kelton photography
www.eakweb.com

> On Aug 27, 2014, at 7:48 PM, cheri allen <notifications@github.com> wrote:
> 
> In app/views/layouts/application.html.erb:
> 
> > @@ -30,10 +30,7 @@
> >  
> >  
> >  </nav>
> > -
> > -<% flash.each do |name, msg| %>
> > -  <%= content_tag :div, msg, class: name %>
> > -<% end %>
> Oops! We need this- it's how we show flash notices and errors.
> 
> —
> Reply to this email directly or view it on GitHub.