index pages
Merge branch 'master' of https://github.com/me33dy/omgneed

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/users/news_feed.html.erb