pull
conflicts
comments working
merge
added comment validations for presence and uniqueness
swear words filter implemented
conflicts