heroku push
merge

Merge branch 'master' of https://github.com/shanemiller500/shanesblog
updated