css
Merge branch 'master' of git://github.com/SanaNasar/Simpsons_blog into dev
background pic
Conflicts:
	micro_blog/app/assets/stylesheets/styles.css
css
Resolving merge conflicts
Doing a merge to reslove conflicts