added model tests and validations
fixed merge conflict in index.html.erb