Comment mess.  Incomplete.  Needs repathing and much more
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

Merge conflict
notices and errors
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
removes mistaken password migrations:
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog into lisa
Merge pull request #103 from marklc44/master

add letter opener and config to environment
manually updates files to deal with conflicts
Merge branch 'master' of https://github.com/lisavogtsf/awesome_blog
Merge branch 'master' into lisa
recreates add password digest migration
tag partial and small route tag fix
Merge pull request #105 from lisavogtsf/lisa

Fixes my problems--only actual changes are formatting, indentation maybe

Yay!
tag partial and small route tag fixx2
Merge pull request #106 from Rakulon/master

Tag fix and partial
comments almost work
add tag forms
merge conflicts fixed
Merge pull request #107 from indotek68/master

Add tag forms
Tag placeholder and tag in controller/veiws