fixing merge conflicts
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

# By lokada (3) and Morgan Chen (1)
# Via lokada (3) and Morgan Chen (1)
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  included flash message in application.html.erb, link_to fixed in home.html.erb
  trying to render Redditpost.all
  fixed logout
  redditposts are being save

Conflicts:
	app/views/home/home.html.erb