Merge branch 'master' of github.com:kul1/b1
Merge branch 'master' of github.com:kul1/b1
fix Article.last
Change to
  %td= link_to article.name, :controller =>'mindapp', :action =>'init' ,:s=>'new_articles:new_show_comments' , :id => article.id
Merge branch 'master' of https://github.com/kul1/b1

Conflicts:
	app/views/new_articles/new_display_articles.haml
	app/views/new_articles/new_show_comments/new_show_comments.html.erb