fixed horizontal bar, tag slug in href and added publish
deleted migrations, fixed settings
Changed settings structure
merge stuff
Merge branch 'master' of heroku.com:safe-ridge-2211

Conflicts:
	.idea/workspace.xml
	blog/migrations/0001_initial.py
	me/static/.sass-cache/cdb0ce2736f82196b53c71f9caa32de8a561d33d/_base.scssc
	me/static/css/styles.css
	me/static/sass/_base.scss
	projects/migrations/0001_initial.py
	templates/base.html
no clue what happened
umm
umm
wtf
hopefully fixed production static files
hopefully fixed production static files
hopefully fixed production static files
hopefully fixed production static files
hopefully fixed production static files
updated project for S3
set debuf false
moved s3 code to production.py
added fabric