I dont think I need these files anymore.
Merge branch 'master' of github.com:MattCowski/Rails_Tutorial_Quiz

Conflicts:
	app/assets/stylesheets/posts.css.scss
	app/controllers/posts_controller.rb
	db/schema.rb
at the end of listing 6.18
start of thursday