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

# By lokada (4) and Morgan Chen (2)
# Via lokada
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  redditpost tests, user/1 no more errors
  added some actions to redditpost controller
  micropost model and controller generated, if log in inputs invalid, redirected_to root_url
  pullling to add sessions
  added sessions without cookies
  added remember_digest to users

Conflicts:
	app/assets/stylesheets/home.css.scss
Cookies twerking
Merge branch 'master' of https://github.com/lynneokada/Reddit-on-Rails

# By lokada (3) and Morgan Chen (1)
# Via lokada (2) and Morgan Chen (1)
* 'master' of https://github.com/lynneokada/Reddit-on-Rails:
  redditpost_form displayed in home
  shared folder created in app/view and redditpost_form.html.erb added
  redditpost resources added
  prepare for pull

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