Added validations to splash and comment
Fixed merge conflict
Merge pull request #39 from hamberguesa/nate_beers_branch

Nate beers branch