changes tags
Merge branch 'master' into work
Merge branch 'master' into work
formats pages show and index date
Merge branch 'work'
Merge pull request #113 from lisavogtsf/lisa

formats date and time on pages index and show
changes tie on comment title to comment title
Merge pull request #114 from lisavogtsf/lisa

changes tie on comment title to comment title
small changes to comment form
merge conflict resolved
password model save!
merge conflict
merge conflict
Merge pull request #115 from indotek68/master

save ! in password model
Merge branch 'master' of github.com:lisavogtsf/awesome_blog

Conflicts:
	app/views/shared/_comment_form.html.erb