hi
Merge branch 'HEAD' of https://github.com/ralampay/gemcamp.git

Conflicts:
	app/views/news_articles/_left_sidebar.html.erb
hi
Merge branch 'HEAD' of https://github.com/ralampay/gemcamp.git

Conflicts:
	app/views/news_articles/show.html.erb
newsroom