asdf
Merge branch 'master' of github.com:zgrannan/bookstand

Conflicts:
	views/comment.html