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

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/views/users/news_feed.html.erb
merge application.css changes
merge application.css changes
application.css revise
user newsfeed view
index view
merging stuff
organizing html