updating css and post css
Merge branch 'master' of github.com:HerrWagner1680/nycda_blog

Conflicts:
	app/assets/stylesheets/application.css
	app/views/posts/_index.html.erb
	app/views/posts/index.html.erb